From: Andrew Morton <akpm@osdl.org>

Cc: Vivek Goyal <vgoyal@in.ibm.com>
Cc: Greg KH <greg@kroah.com>
Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/i386/Kconfig |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN arch/i386/Kconfig~kconfigurable-resources-arch-dependent-changes-arch-a-i-fix arch/i386/Kconfig
--- devel/arch/i386/Kconfig~kconfigurable-resources-arch-dependent-changes-arch-a-i-fix	2006-05-10 21:54:16.000000000 -0700
+++ devel-akpm/arch/i386/Kconfig	2006-05-10 21:54:16.000000000 -0700
@@ -756,7 +756,7 @@ config PHYSICAL_START
 
 config RESOURCES_32BIT
 	bool "32 bit Memory and IO resources (EXPERIMENTAL)"
-	depends on EXPERIMENTAL
+	depends on EXPERIMENTAL && !X86_PAE
 	help
 	  By default resources are 64 bit. This option allows memory and IO
 	  resources to be 32 bit to optimize code size.
_