Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/shaggy...

[pandora-kernel.git] / arch / sh64 / Kconfig

diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
index 4c3e533..7bc0744 100644 (file)
--- a/arch/sh64/Kconfig
+++ b/arch/sh64/Kconfig
@@ -17,21 +17,21 @@ config MMU
        bool
        default y
 
-config UID16
+config RWSEM_GENERIC_SPINLOCK
        bool
        default y
 
-config RWSEM_GENERIC_SPINLOCK
+config GENERIC_FIND_NEXT_BIT
        bool
        default y
 
-config GENERIC_CALIBRATE_DELAY
+config GENERIC_HWEIGHT
        bool
        default y
 
-config LOG_BUF_SHIFT
-       int
-       default 14
+config GENERIC_CALIBRATE_DELAY
+       bool
+       default y
 
 config RWSEM_XCHGADD_ALGORITHM
        bool
@@ -39,6 +39,14 @@ config RWSEM_XCHGADD_ALGORITHM
 config GENERIC_ISA_DMA
        bool
 
+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
+       bool
+       default n
+
 source init/Kconfig
 
 menu "System type"