projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
[powerpc.git]
/
arch
/
cris
/
Kconfig
diff --git
a/arch/cris/Kconfig
b/arch/cris/Kconfig
index
4332ca3
..
b832619
100644
(file)
--- a/
arch/cris/Kconfig
+++ b/
arch/cris/Kconfig
@@
-9,10
+9,6
@@
config MMU
bool
default y
bool
default y
-config UID16
- bool
- default y
-
config RWSEM_GENERIC_SPINLOCK
bool
default y
config RWSEM_GENERIC_SPINLOCK
bool
default y
@@
-74,6
+70,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"
@@
-120,6
+118,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
@@
-147,7
+147,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"