X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fcris%2FKconfig;h=1470146305d8749b90dc1a89cfbf3e1ff257e833;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=a8e4c25c7d4bd9b48887d36f91a49fc01c093f0a;hpb=c7b5ebbddf7bcd3651947760f423e3783bbe6573;p=linux-2.6.git

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index a8e4c25c7..147014630 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -9,16 +9,24 @@ config MMU
 	bool
 	default y
 
-config UID16
+config RWSEM_GENERIC_SPINLOCK
 	bool
 	default y
 
-config RWSEM_GENERIC_SPINLOCK
+config RWSEM_XCHGADD_ALGORITHM
+	bool
+
+config GENERIC_FIND_NEXT_BIT
 	bool
 	default y
 
-config RWSEM_XCHGADD_ALGORITHM
+config GENERIC_HWEIGHT
+	bool
+	default y
+
+config GENERIC_CALIBRATE_DELAY
 	bool
+	default y
 
 config CRIS
 	bool
@@ -70,6 +78,8 @@ config PREEMPT
 	  Say Y here if you are building a kernel for a desktop, embedded
 	  or real-time system.  Say N if you are unsure.
 
+source mm/Kconfig
+
 endmenu
 
 menu "Hardware setup"
@@ -116,6 +126,8 @@ source arch/cris/arch-v10/Kconfig
 
 endmenu
 
+source "net/Kconfig"
+
 # bring in ETRAX built-in drivers
 menu "Drivers for built-in interfaces"
 source arch/cris/arch-v10/drivers/Kconfig
@@ -143,7 +155,7 @@ source "drivers/ieee1394/Kconfig"
 
 source "drivers/message/i2o/Kconfig"
 
-source "net/Kconfig"
+source "drivers/net/Kconfig"
 
 source "drivers/isdn/Kconfig"