commit e8b2fd01228f690c3e0cb3f14facfa8d93d4adae
author Len Brown <len.brown@intel.com> Tue Jul 24 22:26:33 2007 -0400
committer Len Brown <len.brown@intel.com> Wed Jul 25 01:29:39 2007 -0400
tree fb69560e2a584a8ca82985a99e42ec189d592091
parent 7c5aa6642fa26641ebf286966a165aec71c91991

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>

arch/i386/mm/init.c

diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index c3b9905..1b1a1e6 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -432,7 +432,7 @@
 	paravirt_pagetable_setup_done(pgd_base);
 }
 
-#if defined(CONFIG_SOFTWARE_SUSPEND) || defined(CONFIG_ACPI_SLEEP)
+#if defined(CONFIG_SOFTWARE_SUSPEND) || defined(CONFIG_ACPI)
 /*
  * Swap suspend & friends need this for resume because things like the intel-agp
  * driver might have split up a kernel 4MB mapping.