From 62d84ff7c1ed99b34fbb85a68f9a22a0c026aa77 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@stusta.de>
Date: Sat, 4 Feb 2006 23:28:05 -0800
Subject: [PATCH] --- yaml --- r: 19815 b: refs/heads/master c:
 4be68a783d25b4dab0ef4077a4c6b13161a2d6e4 h: refs/heads/master i:   19813:
 a25993fc47669217b7a1856eef38cd4f841aa4d0   19811:
 8c39eabe381a517b70d1ddf0333b93cf1e3b6c5b   19807:
 d5d4516c06b302ab6bdf46fa47a9e2783cc98959 v: v3

---
 [refs]                  | 2 +-
 trunk/arch/i386/Kconfig | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1ced8e87c45e..0f99ed6be4bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 911b0ad25d167fede6aadc05065b414ec7ab5086
+refs/heads/master: 4be68a783d25b4dab0ef4077a4c6b13161a2d6e4
diff --git a/trunk/arch/i386/Kconfig b/trunk/arch/i386/Kconfig
index d86c865a7cd2..0afec8566e7b 100644
--- a/trunk/arch/i386/Kconfig
+++ b/trunk/arch/i386/Kconfig
@@ -442,6 +442,7 @@ config HIGHMEM4G
 
 config HIGHMEM64G
 	bool "64GB"
+	depends on X86_CMPXCHG64
 	help
 	  Select this if you have a 32-bit processor and more than 4
 	  gigabytes of physical RAM.