Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[~andy/linux] / arch / v850 / Kconfig

diff --git a/arch/v850/Kconfig b/arch/v850/Kconfig
index 310865903234750fc4599d7782f5ac0b3e6000a2..04494638b96387203fefc91aebab3be1045bf681 100644 (file)
--- a/arch/v850/Kconfig
+++ b/arch/v850/Kconfig
@@ -10,9 +10,6 @@ mainmenu "uClinux/v850 (w/o MMU) Kernel Configuration"
 config MMU
                bool
        default n
-config UID16
-       bool
-       default n
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y