Commit 2308acca authored by Adrian Bunk's avatar Adrian Bunk Committed by Linus Torvalds
Browse files

[PATCH] "tiny-make-id16-support-optional" fixes



It seems the "make UID16 support optional" patch was checked when it
edited the -tiny tree some time ago, but it wasn't checked whether it
still matches the current situation when it was submitted for inclusion
in -mm. This patch fixes the following bugs:
- ARCH_S390X does no longer exist, nowadays this has to be expressed
  through (S390 && 64BIT)
- in five architecture specific Kconfig files the UID16 options
  weren't removed

Additionally, it changes the fragile negative dependencies of UID16 to
positive dependencies (new architectures are more likely to not require
UID16 support).

Signed-off-by: default avatarAdrian Bunk <bunk@stusta.de>
Acked-by: default avatarMatt Mackall <mpm@selenic.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1306a482
Loading
Loading
Loading
Loading
+0 −4
Original line number Diff line number Diff line
@@ -6,10 +6,6 @@ config FRV
	bool
	default y

config UID16
	bool
	default y

config RWSEM_GENERIC_SPINLOCK
	bool
	default y
+0 −4
Original line number Diff line number Diff line
@@ -12,10 +12,6 @@ config M32R
config SBUS
	bool

config UID16
	bool
	default n

config GENERIC_ISA_DMA
	bool
	default y
+0 −5
Original line number Diff line number Diff line
@@ -27,11 +27,6 @@ config S390
	bool
	default y

config UID16
	bool
	default y
	depends on !64BIT

source "init/Kconfig"

menu "Base setup"
+0 −4
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ config MMU
	bool
	default y

config UID16
	bool
	default y

config RWSEM_GENERIC_SPINLOCK
	bool
	default y
+0 −4
Original line number Diff line number Diff line
@@ -18,10 +18,6 @@ config XTENSA
	  with reasonable minimum requirements.  The Xtensa Linux project has
	  a home page at <http://xtensa.sourceforge.net/>.

config UID16
	bool
	default n

config RWSEM_XCHGADD_ALGORITHM
	bool
	default y
Loading