Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6-omap-h63xx.git] / arch / sh64 / Kconfig

diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
index 4c3e5334adb3208361123062aabf5abe8c7fd745..58c678e0666786709a6da152d24fa3d9df158dfd 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