15 files changed, 29 insertions, 25 deletions

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index d2703cda61ea..2e3e8dbcb79f 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -5,7 +5,7 @@
 
 mainmenu "Linux Kernel Configuration"
 
-config X86
+config X86_32
         bool
         default y
         help
@@ -18,6 +18,10 @@ config SEMAPHORE_SLEEPERS
         bool
         default y
 
+config X86
+        bool
+        default y
+
 config MMU
         bool
         default y
diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index c29365d5b524..7902c3630681 100644
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -661,7 +661,7 @@ config HW_RANDOM
 
 config NVRAM
         tristate "/dev/nvram support"
-        depends on ATARI || X86 || X86_64 || ARM || GENERIC_NVRAM
+        depends on ATARI || X86 || ARM || GENERIC_NVRAM
         ---help---
           If you say Y here and create a character special file /dev/nvram
           with major number 10 and minor number 144 using mknod ("man mknod"),
@@ -985,7 +985,7 @@ config MAX_RAW_DEVS
 
 config HANGCHECK_TIMER
         tristate "Hangcheck timer"
-        depends on X86_64 || X86 || IA64 || PPC64 || ARCH_S390
+        depends on X86 || IA64 || PPC64 || ARCH_S390
         help
           The hangcheck-timer module detects when the system has gone
           out to lunch past a certain margin.  It can reboot the system
diff --git a/drivers/char/agp/Kconfig b/drivers/char/agp/Kconfig
index 7f8c1b53b754..486ed8a11b59 100644
--- a/drivers/char/agp/Kconfig
+++ b/drivers/char/agp/Kconfig
@@ -27,7 +27,7 @@ config AGP
 
 config AGP_ALI
         tristate "ALI chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
         ---help---
           This option gives you AGP support for the GLX component of
           XFree86 4.x on the following ALi chipsets.  The supported chipsets
@@ -45,7 +45,7 @@ config AGP_ALI
 
 config AGP_ATI
         tristate "ATI chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
         ---help---
       This option gives you AGP support for the GLX component of
       XFree86 4.x on the ATI RadeonIGP family of chipsets.
@@ -55,7 +55,7 @@ config AGP_ATI
 
 config AGP_AMD
         tristate "AMD Irongate, 761, and 762 chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
         help
           This option gives you AGP support for the GLX component of
           XFree86 4.x on AMD Irongate, 761, and 762 chipsets.
@@ -91,7 +91,7 @@ config AGP_INTEL
 
 config AGP_NVIDIA
         tristate "NVIDIA nForce/nForce2 chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
         help
           This option gives you AGP support for the GLX component of
           XFree86 4.x on the following NVIDIA chipsets.  The supported chipsets
@@ -99,7 +99,7 @@ config AGP_NVIDIA
 
 config AGP_SIS
         tristate "SiS chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
         help
           This option gives you AGP support for the GLX component of
           XFree86 4.x on Silicon Integrated Systems [SiS] chipsets.
@@ -111,14 +111,14 @@ config AGP_SIS
 
 config AGP_SWORKS
         tristate "Serverworks LE/HE chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
         help
           Say Y here to support the Serverworks AGP card.  See 
           <http://www.serverworks.com/> for product descriptions and images.
 
 config AGP_VIA
         tristate "VIA chipset support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
         help
           This option gives you AGP support for the GLX component of
           XFree86 4.x on VIA MVP3/Apollo Pro chipsets.
@@ -154,7 +154,7 @@ config AGP_UNINORTH
 
 config AGP_EFFICEON
         tristate "Transmeta Efficeon support"
-        depends on AGP && X86 && !X86_64
+        depends on AGP && X86_32
         help
           This option gives you AGP support for the Transmeta Efficeon
           series processors with integrated northbridges.
diff --git a/drivers/char/hangcheck-timer.c b/drivers/char/hangcheck-timer.c
index a54bc93353af..66e53dd450ff 100644
--- a/drivers/char/hangcheck-timer.c
+++ b/drivers/char/hangcheck-timer.c
@@ -117,7 +117,7 @@ __setup("hcheck_reboot", hangcheck_parse_reboot);
 __setup("hcheck_dump_tasks", hangcheck_parse_dump_tasks);
 #endif /* not MODULE */
 
-#if defined(CONFIG_X86) || defined(CONFIG_X86_64)
+#if defined(CONFIG_X86)
 # define HAVE_MONOTONIC
 # define TIMER_FREQ 1000000000ULL
 #elif defined(CONFIG_ARCH_S390)
diff --git a/drivers/crypto/Kconfig b/drivers/crypto/Kconfig
index 094835cce321..4263935443cc 100644
--- a/drivers/crypto/Kconfig
+++ b/drivers/crypto/Kconfig
@@ -2,7 +2,7 @@ menu "Hardware crypto devices"
 
 config CRYPTO_DEV_PADLOCK
         tristate "Support for VIA PadLock ACE"
-        depends on CRYPTO && X86 && !X86_64
+        depends on CRYPTO && X86_32
         help
           Some VIA processors come with an integrated crypto engine
           (so called VIA PadLock ACE, Advanced Cryptography Engine)
diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 327b58e64875..9925de291e31 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -70,7 +70,7 @@ config DELL_RBU
 
 config DCDBAS
         tristate "Dell Systems Management Base Driver"
-        depends on X86 || X86_64
+        depends on X86
         default m
         help
           The Dell Systems Management Base Driver provides a sysfs interface
diff --git a/drivers/input/misc/Kconfig b/drivers/input/misc/Kconfig
index bb934e6d9636..b3eaac1b35b6 100644
--- a/drivers/input/misc/Kconfig
+++ b/drivers/input/misc/Kconfig
@@ -14,7 +14,7 @@ if INPUT_MISC
 
 config INPUT_PCSPKR
         tristate "PC Speaker support"
-        depends on ALPHA || X86 || X86_64 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
+        depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
         help
           Say Y here if you want the standard PC Speaker to be used for
           bells and whistles.
diff --git a/drivers/pci/hotplug/pciehp_pci.c b/drivers/pci/hotplug/pciehp_pci.c
index 33b539b34f7e..ff17d8e07e94 100644
--- a/drivers/pci/hotplug/pciehp_pci.c
+++ b/drivers/pci/hotplug/pciehp_pci.c
@@ -113,7 +113,7 @@ int pciehp_unconfigure_device(struct pci_func* func)
  */
 int pciehp_set_irq (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num)
 {
-#if defined(CONFIG_X86) && !defined(CONFIG_X86_IO_APIC) && !defined(CONFIG_X86_64)
+#if defined(CONFIG_X86_32) && !defined(CONFIG_X86_IO_APIC)
         int rc;
         u16 temp_word;
         struct pci_dev fakedev;
diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index fc87e7e2b6b8..00960a379b9c 100644
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -779,7 +779,7 @@ static int nonstatic_autoadd_resources(struct pcmcia_socket *s)
         if (!s->cb_dev || !s->cb_dev->bus)
                 return -ENODEV;
 
-#if defined(CONFIG_X86) || defined(CONFIG_X86_64)
+#if defined(CONFIG_X86)
         /* If this is the root bus, the risk of hitting
          * some strange system devices which aren't protected
          * by either ACPI resource tables or properly requested
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7e297947a2b2..7192b770bfb6 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -494,7 +494,7 @@ config FB_TGA
 
 config FB_VESA
         bool "VESA VGA graphics support"
-        depends on (FB = y) && (X86 || X86_64)
+        depends on (FB = y) && X86
         select FB_CFB_FILLRECT
         select FB_CFB_COPYAREA
         select FB_CFB_IMAGEBLIT
@@ -712,7 +712,7 @@ config FB_RIVA_DEBUG
 
 config FB_I810
         tristate "Intel 810/815 support (EXPERIMENTAL)"
-        depends on FB && EXPERIMENTAL && PCI && X86 && !X86_64
+        depends on FB && EXPERIMENTAL && PCI && X86_32
         select AGP
         select AGP_INTEL
         select FB_MODE_HELPERS
@@ -761,7 +761,7 @@ config FB_I810_I2C
 
 config FB_INTEL
         tristate "Intel 830M/845G/852GM/855GM/865G support (EXPERIMENTAL)"
-        depends on FB && EXPERIMENTAL && PCI && X86 && !X86_64
+        depends on FB && EXPERIMENTAL && PCI && X86_32
         select AGP
         select AGP_INTEL
         select FB_MODE_HELPERS
diff --git a/drivers/video/console/Kconfig b/drivers/video/console/Kconfig
index 7e731691e2a9..6a9ae2b3d1ab 100644
--- a/drivers/video/console/Kconfig
+++ b/drivers/video/console/Kconfig
@@ -28,7 +28,7 @@ config VGA_CONSOLE
 
 config VIDEO_SELECT
         bool "Video mode selection support"
-        depends on  (X86 || X86_64) && VGA_CONSOLE
+        depends on  X86 && VGA_CONSOLE
         ---help---
           This enables support for text mode selection on kernel startup. If
           you want to take advantage of some high-resolution text mode your
diff --git a/fs/Kconfig b/fs/Kconfig
index 48f5422cb19a..01a295232f75 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -810,7 +810,7 @@ config TMPFS
 
 config HUGETLBFS
         bool "HugeTLB file system support"
-        depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || X86_64 || BROKEN
+        depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
 
 config HUGETLB_PAGE
         def_bool HUGETLBFS
diff --git a/fs/Kconfig.binfmt b/fs/Kconfig.binfmt
index 434c19d076ac..175b2e8177c1 100644
--- a/fs/Kconfig.binfmt
+++ b/fs/Kconfig.binfmt
@@ -57,7 +57,7 @@ config BINFMT_SHARED_FLAT
 
 config BINFMT_AOUT
         tristate "Kernel support for a.out and ECOFF binaries"
-        depends on (X86 && !X86_64) || ALPHA || ARM || M68K || SPARC32
+        depends on X86_32 || ALPHA || ARM || M68K || SPARC32
         ---help---
           A.out (Assembler.OUTput) is a set of formats for libraries and
           executables used in the earliest versions of UNIX.  Linux used
diff --git a/include/linux/dmi.h b/include/linux/dmi.h
index a415f1d93e9a..05f4132622fc 100644
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
@@ -60,7 +60,7 @@ struct dmi_device {
         void *device_data;      /* Type specific data */
 };
 
-#if defined(CONFIG_X86) && !defined(CONFIG_X86_64)
+#if defined(CONFIG_X86_32)
 
 extern int dmi_check_system(struct dmi_system_id *list);
 extern char * dmi_get_system_info(int field);
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 016e89a44ac8..807535e7a1e7 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -128,7 +128,7 @@ config DEBUG_HIGHMEM
 config DEBUG_BUGVERBOSE
         bool "Verbose BUG() reporting (adds 70K)" if DEBUG_KERNEL && EMBEDDED
         depends on BUG
-        depends on ARM || ARM26 || M32R || M68K || SPARC32 || SPARC64 || (X86 && !X86_64) || FRV
+        depends on ARM || ARM26 || M32R || M68K || SPARC32 || SPARC64 || X86_32 || FRV
         default !EMBEDDED
         help
           Say Y here to make BUG() panics output the file name and line number