Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

[mv-sheeva.git] / arch / sparc / Kconfig

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 3cfb8be3ff6d0f9fe5be0c600a9f035787f767d4..f944b58cdfe79fde99ab07fc2348f2af059875f6 100644 (file)
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -9,10 +9,6 @@ config MMU
        bool
        default y
 
-config UID16
-       bool
-       default y
-
 config HIGHMEM
        bool
        default y
@@ -55,6 +51,10 @@ config NR_CPUS
        depends on SMP
        default "32"
 
+config SPARC
+       bool
+       default y
+
 # Identify this as a Sparc32 build
 config SPARC32
        bool