X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=arch%2Fx86%2FKconfig;h=4cf0ab13d187a943f88afc1d9761c739fee41008;hb=a15a82f42c5ee519d28f08c932803a9fd5168fc4;hp=d11d7b513191fac5d46dcbe12f600fb3ca0832cd;hpb=8bd93ca7b03f38a7bc1a4ed9e93e8c006e753d5b;p=linux-2.6-omap-h63xx.git

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index d11d7b51319..4cf0ab13d18 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -231,6 +231,10 @@ config SMP
 
 	  If you don't know what to do here, say N.
 
+config X86_HAS_BOOT_CPU_ID
+	def_bool y
+	depends on X86_VOYAGER
+
 config X86_FIND_SMP_CONFIG
 	def_bool y
 	depends on X86_MPPARSE || X86_VOYAGER
@@ -1490,7 +1494,7 @@ config HAVE_ARCH_EARLY_PFN_TO_NID
 	def_bool X86_64
 	depends on NUMA
 
-menu "Power management options"
+menu "Power management and ACPI options"
 	depends on !X86_VOYAGER
 
 config ARCH_HIBERNATION_HEADER
@@ -1890,6 +1894,10 @@ config SYSVIPC_COMPAT
 endmenu
 
 
+config HAVE_ATOMIC_IOMAP
+	def_bool y
+	depends on X86_32
+
 source "net/Kconfig"
 
 source "drivers/Kconfig"