diff options
author | Len Brown <len.brown@intel.com> | 2007-07-25 02:26:33 (GMT) |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2007-07-25 05:29:39 (GMT) |
commit | e8b2fd01228f690c3e0cb3f14facfa8d93d4adae (patch) | |
tree | fb69560e2a584a8ca82985a99e42ec189d592091 /include/asm-i386 | |
parent | 7c5aa6642fa26641ebf286966a165aec71c91991 (diff) | |
download | linux-fsl-qoriq-e8b2fd01228f690c3e0cb3f14facfa8d93d4adae.tar.xz |
ACPI: Kconfig: remove CONFIG_ACPI_SLEEP from source
As it was a synonym for (CONFIG_ACPI && CONFIG_X86),
the ifdefs for it were more clutter than they were worth.
For ia64, just add a few stubs in anticipation of future
S3 or S4 support.
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/asm-i386')
-rw-r--r-- | include/asm-i386/acpi.h | 23 | ||||
-rw-r--r-- | include/asm-i386/suspend.h | 2 |
2 files changed, 10 insertions, 15 deletions
diff --git a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h index 449f3f2..125179ad 100644 --- a/include/asm-i386/acpi.h +++ b/include/asm-i386/acpi.h @@ -121,19 +121,6 @@ static inline void acpi_disable_pci(void) } extern int acpi_irq_balance_set(char *str); -#else /* !CONFIG_ACPI */ - -#define acpi_lapic 0 -#define acpi_ioapic 0 -static inline void acpi_noirq_set(void) { } -static inline void acpi_disable_pci(void) { } -static inline void disable_acpi(void) { } - -#endif /* !CONFIG_ACPI */ - - -#ifdef CONFIG_ACPI_SLEEP - /* routines for saving/restoring kernel state */ extern int acpi_save_state_mem(void); extern void acpi_restore_state_mem(void); @@ -143,7 +130,15 @@ extern unsigned long acpi_wakeup_address; /* early initialization routine */ extern void acpi_reserve_bootmem(void); -#endif /*CONFIG_ACPI_SLEEP*/ +#else /* !CONFIG_ACPI */ + +#define acpi_lapic 0 +#define acpi_ioapic 0 +static inline void acpi_noirq_set(void) { } +static inline void acpi_disable_pci(void) { } +static inline void disable_acpi(void) { } + +#endif /* !CONFIG_ACPI */ #define ARCH_HAS_POWER_INIT 1 diff --git a/include/asm-i386/suspend.h b/include/asm-i386/suspend.h index 8dbaafe..a252073 100644 --- a/include/asm-i386/suspend.h +++ b/include/asm-i386/suspend.h @@ -21,7 +21,7 @@ struct saved_context { unsigned long return_address; } __attribute__((packed)); -#ifdef CONFIG_ACPI_SLEEP +#ifdef CONFIG_ACPI extern unsigned long saved_eip; extern unsigned long saved_esp; extern unsigned long saved_ebp; |