Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6

[safe/jmp/linux-2.6] / arch / sh64 / Kconfig

diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
index 708e597..e14b533 100644 (file)
--- a/arch/sh64/Kconfig
+++ b/arch/sh64/Kconfig
@@ -17,27 +17,32 @@ 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
 
-config GENERIC_ISA_DMA
+config ARCH_HAS_ILOG2_U32
+       bool
+       default n
+
+config ARCH_HAS_ILOG2_U64
        bool
+       default n
 
 source init/Kconfig
 
@@ -268,6 +273,8 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"