[PATCH] x86: simplify HIGHMEM-related Kconfig entries

["Jan Beulich" <jbeulich@novell.com>]

Additionally remove the dependency of X86_PAE on !HIGHMEM4G - at least
I can't understand why that dependency existed.

Signed-off-by: Jan Beulich <jbeulich@novell.com>

---
 arch/x86/Kconfig |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- linux-2.6.29-rc1/arch/x86/Kconfig	2009-01-14 11:36:05.000000000 +0100
+++ 2.6.29-rc1-x86-kconfig-highmem/arch/x86/Kconfig	2009-01-08 09:03:21.000000000 +0100
@@ -896,8 +896,8 @@ config X86_CPUID
 
 choice
 	prompt "High Memory Support"
-	default HIGHMEM4G if !X86_NUMAQ
 	default HIGHMEM64G if X86_NUMAQ
+	default HIGHMEM4G
 	depends on X86_32
 
 config NOHIGHMEM
@@ -1004,7 +1004,7 @@ config HIGHMEM
 
 config X86_PAE
 	bool "PAE (Physical Address Extension) Support"
-	depends on X86_32 && !HIGHMEM4G
+	depends on X86_32
 	help
 	  PAE is required for NX support, and furthermore enables
 	  larger swapspace support for non-overcommit purposes. It
@@ -1147,7 +1147,7 @@ source "mm/Kconfig"
 
 config HIGHPTE
 	bool "Allocate 3rd-level pagetables from highmem"
-	depends on X86_32 && (HIGHMEM4G || HIGHMEM64G)
+	depends on HIGHMEM
 	help
 	  The VM uses one page table entry for each page of physical memory.
 	  For systems with a lot of RAM, this can be wasteful of precious