git.samba.org
/
sfrench
/
cifs-2.6.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-2.6
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
configs
/
86xx
/
gef_ppc9a_defconfig
diff --git
a/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
b/arch/powerpc/configs/86xx/gef_ppc9a_defconfig
index 183c59c6d8966a0c41469a178adbef50524a173e..b728a7d642504e7c486c7955e1209fa2922fd4c8 100644
(file)
--- a/
arch/powerpc/configs/86xx/gef_ppc9a_defconfig
+++ b/
arch/powerpc/configs/86xx/gef_ppc9a_defconfig
@@
-103,8
+103,7
@@
CONFIG_IKCONFIG=y
CONFIG_IKCONFIG_PROC=y
CONFIG_LOG_BUF_SHIFT=14
# CONFIG_CGROUPS is not set
-CONFIG_SYSFS_DEPRECATED=y
-CONFIG_SYSFS_DEPRECATED_V2=y
+# CONFIG_SYSFS_DEPRECATED_V2 is not set
CONFIG_RELAY=y
# CONFIG_NAMESPACES is not set
CONFIG_BLK_DEV_INITRD=y