Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

[powerpc.git] / arch / arm26 / Kconfig

diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig
index 1f03732..274e070 100644 (file)
--- a/arch/arm26/Kconfig
+++ b/arch/arm26/Kconfig
@@ -34,10 +34,6 @@ config FORCE_MAX_ZONEORDER
         int
         default 9
 
-config UID16
-       bool
-       default y
-
 config RWSEM_GENERIC_SPINLOCK
        bool
        default y
@@ -55,6 +51,10 @@ config GENERIC_BUST_SPINLOCK
 config GENERIC_ISA_DMA
        bool
 
+config ARCH_MAY_HAVE_PC_FDC
+       bool
+       default y
+
 source "init/Kconfig"