From: Randy Dunlap <[email protected]>
Replace ARCH_HAS_POWER_INIT with CONFIG_ACPI_POWER_INIT.
Move it from header files to Kconfig space.
Signed-off-by: Randy Dunlap <[email protected]>
---
drivers/acpi/Kconfig | 4 ++++
include/acpi/processor.h | 2 +-
include/asm-i386/acpi.h | 2 --
include/asm-x86_64/acpi.h | 2 --
4 files changed, 5 insertions(+), 5 deletions(-)
--- linux-2618-rc4-arch.orig/include/acpi/processor.h
+++ linux-2618-rc4-arch/include/acpi/processor.h
@@ -203,7 +203,7 @@ extern struct acpi_processor_errata erra
void arch_acpi_processor_init_pdc(struct acpi_processor *pr);
-#ifdef ARCH_HAS_POWER_INIT
+#ifdef CONFIG_ACPI_POWER_INIT
void acpi_processor_power_init_bm_check(struct acpi_processor_flags *flags,
unsigned int cpu);
#else
--- linux-2618-rc4-arch.orig/drivers/acpi/Kconfig
+++ linux-2618-rc4-arch/drivers/acpi/Kconfig
@@ -295,6 +295,10 @@ config ACPI_POWER
bool
default y
+config ACPI_POWER_INIT
+ def_bool y
+ depends on X86
+
config ACPI_SYSTEM
bool
default y
--- linux-2618-rc4-arch.orig/include/asm-i386/acpi.h
+++ linux-2618-rc4-arch/include/asm-i386/acpi.h
@@ -181,8 +181,6 @@ extern void acpi_reserve_bootmem(void);
extern u8 x86_acpiid_to_apicid[];
-#define ARCH_HAS_POWER_INIT 1
-
#endif /*__KERNEL__*/
#endif /*_ASM_ACPI_H*/
--- linux-2618-rc4-arch.orig/include/asm-x86_64/acpi.h
+++ linux-2618-rc4-arch/include/asm-x86_64/acpi.h
@@ -162,8 +162,6 @@ extern int acpi_pci_disabled;
extern u8 x86_acpiid_to_apicid[];
-#define ARCH_HAS_POWER_INIT 1
-
extern int acpi_skip_timer_override;
#endif /*__KERNEL__*/
---