git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
/
cris
/
Kconfig
diff --git
a/arch/cris/Kconfig
b/arch/cris/Kconfig
index
a8e4c25
..
1470146
100644
(file)
--- a/
arch/cris/Kconfig
+++ b/
arch/cris/Kconfig
@@
-9,16
+9,24
@@
config MMU
bool
default y
bool
default y
-config
UID16
+config
RWSEM_GENERIC_SPINLOCK
bool
default y
bool
default y
-config RWSEM_GENERIC_SPINLOCK
+config RWSEM_XCHGADD_ALGORITHM
+ bool
+
+config GENERIC_FIND_NEXT_BIT
bool
default y
bool
default y
-config RWSEM_XCHGADD_ALGORITHM
+config GENERIC_HWEIGHT
+ bool
+ default y
+
+config GENERIC_CALIBRATE_DELAY
bool
bool
+ default y
config CRIS
bool
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.
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"
endmenu
menu "Hardware setup"
@@
-116,6
+126,8
@@
source arch/cris/arch-v10/Kconfig
endmenu
endmenu
+source "net/Kconfig"
+
# bring in ETRAX built-in drivers
menu "Drivers for built-in interfaces"
source arch/cris/arch-v10/drivers/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 "drivers/message/i2o/Kconfig"
-source "net/Kconfig"
+source "
drivers/
net/Kconfig"
source "drivers/isdn/Kconfig"
source "drivers/isdn/Kconfig"