projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'acpi-numa', 'acpi-tables' and 'acpi-osi'
[linux-2.6-block.git]
/
drivers
/
acpi
/
internal.h
diff --git
a/drivers/acpi/internal.h
b/drivers/acpi/internal.h
index 7c188472d9c276f985f06f6c658e7329b7f2423b..9bb0773d39bfd14f87f0e8dbfe5a1ed31b54162d 100644
(file)
--- a/
drivers/acpi/internal.h
+++ b/
drivers/acpi/internal.h
@@
-20,7
+20,8
@@
#define PREFIX "ACPI: "
#define PREFIX "ACPI: "
-void acpi_initrd_initialize_tables(void);
+int early_acpi_osi_init(void);
+int acpi_osi_init(void);
acpi_status acpi_os_initialize1(void);
void init_acpi_device_notify(void);
int acpi_scan_init(void);
acpi_status acpi_os_initialize1(void);
void init_acpi_device_notify(void);
int acpi_scan_init(void);