git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull acpi_bus_register_driver into release branch
[sfrench/cifs-2.6.git]
/
include
/
acpi
/
acpi_bus.h
diff --git
a/include/acpi/acpi_bus.h
b/include/acpi/acpi_bus.h
index 809eb501a22b9ab5e25c6da452317fc4b17ad328..8c7590fdd822531d7d1fd62f55397578350171b5 100644
(file)
--- a/
include/acpi/acpi_bus.h
+++ b/
include/acpi/acpi_bus.h
@@
-59,7
+59,7
@@
acpi_evaluate_reference(acpi_handle handle,
#define ACPI_BUS_FILE_ROOT "acpi"
extern struct proc_dir_entry *acpi_root_dir;
#define ACPI_BUS_FILE_ROOT "acpi"
extern struct proc_dir_entry *acpi_root_dir;
-extern
FADT_DESCRIPTOR
acpi_fadt;
+extern
struct fadt_descriptor
acpi_fadt;
enum acpi_bus_removal_type {
ACPI_BUS_REMOVAL_NORMAL = 0,
enum acpi_bus_removal_type {
ACPI_BUS_REMOVAL_NORMAL = 0,