5 files changed, 7 insertions, 13 deletions

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index 524cbf151fc2..251344cb29ae 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -11,6 +11,9 @@ menuconfig ACPI
         depends on PCI
         depends on PM
         select PNP
+        # for sleep
+        select HOTPLUG_CPU if X86 && SMP
+        select SUSPEND_SMP if X86 && SMP
         default y
         ---help---
           Advanced Configuration and Power Interface (ACPI) support for 
@@ -42,13 +45,6 @@ menuconfig ACPI
 
 if ACPI
 
-config ACPI_SLEEP
-        bool
-        depends on X86
-        select HOTPLUG_CPU if SMP
-        select SUSPEND_SMP if SMP
-        default y
-
 config ACPI_PROCFS
         bool "Deprecated /proc/acpi files"
         depends on PROC_FS
diff --git a/drivers/acpi/sleep/Makefile b/drivers/acpi/sleep/Makefile
index 195a4f69c0f7..01a993a1d086 100644
--- a/drivers/acpi/sleep/Makefile
+++ b/drivers/acpi/sleep/Makefile
@@ -1,5 +1,5 @@
 obj-y                                   := poweroff.o wakeup.o
-obj-$(CONFIG_ACPI_SLEEP)                += main.o
-obj-$(CONFIG_ACPI_SLEEP)                += proc.o
+obj-y                                   += main.o
+obj-$(CONFIG_X86)                       += proc.o
 
 EXTRA_CFLAGS += $(ACPI_CFLAGS)
diff --git a/drivers/acpi/sleep/main.c b/drivers/acpi/sleep/main.c
index 3279e72a94f8..54c2dfcf8651 100644
--- a/drivers/acpi/sleep/main.c
+++ b/drivers/acpi/sleep/main.c
@@ -136,10 +136,12 @@ static int acpi_pm_finish(suspend_state_t pm_state)
         /* reset firmware waking vector */
         acpi_set_firmware_waking_vector((acpi_physical_address) 0);
 
+#ifdef CONFIG_X86
         if (init_8259A_after_S1) {
                 printk("Broken toshiba laptop -> kicking interrupts\n");
                 init_8259A(0);
         }
+#endif
         return 0;
 }
 
diff --git a/drivers/acpi/sleep/poweroff.c b/drivers/acpi/sleep/poweroff.c
index 39e40d56b034..b3f68ef0669e 100644
--- a/drivers/acpi/sleep/poweroff.c
+++ b/drivers/acpi/sleep/poweroff.c
@@ -18,7 +18,6 @@
 
 int acpi_sleep_prepare(u32 acpi_state)
 {
-#ifdef CONFIG_ACPI_SLEEP
         /* do we have a wakeup address for S2 and S3? */
         if (acpi_state == ACPI_STATE_S3) {
                 if (!acpi_wakeup_address) {
@@ -31,7 +30,6 @@ int acpi_sleep_prepare(u32 acpi_state)
         }
         ACPI_FLUSH_CPU_CACHE();
         acpi_enable_wakeup_device_prep(acpi_state);
-#endif
         acpi_gpe_sleep_prepare(acpi_state);
         acpi_enter_sleep_state_prep(acpi_state);
         return 0;
diff --git a/drivers/acpi/sleep/wakeup.c b/drivers/acpi/sleep/wakeup.c
index fab8f2694f03..97c27ddb144d 100644
--- a/drivers/acpi/sleep/wakeup.c
+++ b/drivers/acpi/sleep/wakeup.c
@@ -17,7 +17,6 @@ ACPI_MODULE_NAME("wakeup_devices")
 extern struct list_head acpi_wakeup_device_list;
 extern spinlock_t acpi_device_lock;
 
-#ifdef CONFIG_ACPI_SLEEP
 /**
  * acpi_enable_wakeup_device_prep - prepare wakeup devices
  *      @sleep_state:   ACPI state
@@ -180,7 +179,6 @@ static int __init acpi_wakeup_device_init(void)
 }
 
 late_initcall(acpi_wakeup_device_init);
-#endif
 
 /*
  * Disable all wakeup GPEs before entering requested sleep state.