diff options
author | Len Brown <len.brown@intel.com> | 2009-06-12 20:42:08 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-06-12 20:50:38 -0400 |
commit | 4a7a16dc061e4c57bf288150f51bd4c2ace33723 (patch) | |
tree | 34bd1b25321269b8ad8a172e03655db2a28ecca7 | |
parent | c4bf2f372db09ef8d16a25a60d523bfa1c50f7b5 (diff) |
ACPI: move declaration acpi_early_init() to acpi.h
Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r-- | include/linux/acpi.h | 3 | ||||
-rw-r--r-- | init/main.c | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 73cb141150df..bf17681cb06f 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -290,7 +290,10 @@ void __init acpi_s4_no_nvs(void); | |||
290 | OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL) | 290 | OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL) |
291 | 291 | ||
292 | extern acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 flags); | 292 | extern acpi_status acpi_pci_osc_control_set(acpi_handle handle, u32 flags); |
293 | extern void acpi_early_init(void); | ||
294 | |||
293 | #else /* CONFIG_ACPI */ | 295 | #else /* CONFIG_ACPI */ |
296 | static inline void acpi_early_init(void) { } | ||
294 | 297 | ||
295 | static inline int early_acpi_boot_init(void) | 298 | static inline int early_acpi_boot_init(void) |
296 | { | 299 | { |
diff --git a/init/main.c b/init/main.c index d721dad05dd7..f1b9f0fdb1b4 100644 --- a/init/main.c +++ b/init/main.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include <linux/smp_lock.h> | 24 | #include <linux/smp_lock.h> |
25 | #include <linux/initrd.h> | 25 | #include <linux/initrd.h> |
26 | #include <linux/bootmem.h> | 26 | #include <linux/bootmem.h> |
27 | #include <linux/acpi.h> | ||
27 | #include <linux/tty.h> | 28 | #include <linux/tty.h> |
28 | #include <linux/gfp.h> | 29 | #include <linux/gfp.h> |
29 | #include <linux/percpu.h> | 30 | #include <linux/percpu.h> |
@@ -86,11 +87,6 @@ extern void sbus_init(void); | |||
86 | extern void prio_tree_init(void); | 87 | extern void prio_tree_init(void); |
87 | extern void radix_tree_init(void); | 88 | extern void radix_tree_init(void); |
88 | extern void free_initmem(void); | 89 | extern void free_initmem(void); |
89 | #ifdef CONFIG_ACPI | ||
90 | extern void acpi_early_init(void); | ||
91 | #else | ||
92 | static inline void acpi_early_init(void) { } | ||
93 | #endif | ||
94 | #ifndef CONFIG_DEBUG_RODATA | 90 | #ifndef CONFIG_DEBUG_RODATA |
95 | static inline void mark_rodata_ro(void) { } | 91 | static inline void mark_rodata_ro(void) { } |
96 | #endif | 92 | #endif |