Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/arch/sh64/Kconfig b/arch/sh64/Kconfig
index 76eb81f..58c678e 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
@@ -217,6 +217,8 @@ config PREEMPT
        bool "Preemptible Kernel (EXPERIMENTAL)"
        depends on EXPERIMENTAL
 
+source "mm/Kconfig"
+
 endmenu
 
 menu "Bus options (PCI, PCMCIA, EISA, MCA, ISA)"
@@ -266,6 +268,8 @@ source "fs/Kconfig.binfmt"
 
 endmenu
 
+source "net/Kconfig"
+
 source "drivers/Kconfig"
 
 source "fs/Kconfig"