projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
[linux-2.6-microblaze.git]
/
arch
/
tile
/
configs
/
tilegx_defconfig
diff --git
a/arch/tile/configs/tilegx_defconfig
b/arch/tile/configs/tilegx_defconfig
index
984fa00
..
3f3dfb8
100644
(file)
--- a/
arch/tile/configs/tilegx_defconfig
+++ b/
arch/tile/configs/tilegx_defconfig
@@
-374,7
+374,6
@@
CONFIG_DEBUG_CREDENTIALS=y
CONFIG_RCU_CPU_STALL_TIMEOUT=60
CONFIG_ASYNC_RAID6_TEST=m
CONFIG_KGDB=y
-CONFIG_KEYS_DEBUG_PROC_KEYS=y
CONFIG_SECURITY=y
CONFIG_SECURITYFS=y
CONFIG_SECURITY_NETWORK=y