git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
[pandora-kernel.git]
/
arch
/
sh64
/
Kconfig
diff --git
a/arch/sh64/Kconfig
b/arch/sh64/Kconfig
index
708e597
..
fb35b45
100644
(file)
--- a/
arch/sh64/Kconfig
+++ b/
arch/sh64/Kconfig
@@
-29,10
+29,6
@@
config GENERIC_CALIBRATE_DELAY
bool
default y
-config LOG_BUF_SHIFT
- int
- default 14
-
config RWSEM_XCHGADD_ALGORITHM
bool
@@
-268,6
+264,8
@@
source "fs/Kconfig.binfmt"
endmenu
+source "net/Kconfig"
+
source "drivers/Kconfig"
source "fs/Kconfig"