Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0d078f6f authored by Brian Gerst's avatar Brian Gerst Committed by Linus Torvalds
Browse files

[PATCH] CONFIG_IA32 



Add CONFIG_X86_32 for i386.  This allows selecting options that only apply
to 32-bit systems.

(X86 && !X86_64) becomes X86_32
(X86 ||  X86_64) becomes X86

Signed-off-by: default avatarBrian Gerst <bgerst@didntduck.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 4276d322

arch/i386/Kconfig

+5 −1
Original line number Diff line number Diff line
@@ -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

drivers/char/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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

drivers/char/agp/Kconfig

+8 −8
Original line number Diff line number Diff line
@@ -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.

drivers/char/hangcheck-timer.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/crypto/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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)