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 branch 'msr-bitmaps' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
configs
/
fsl-emb-nonhw.config
diff --git
a/arch/powerpc/configs/fsl-emb-nonhw.config
b/arch/powerpc/configs/fsl-emb-nonhw.config
index cc49c95494da4600d098833eb19819e45d66a5f3..e0567dc4196873347cd37a4d264cdd909272dd5e 100644
(file)
--- a/
arch/powerpc/configs/fsl-emb-nonhw.config
+++ b/
arch/powerpc/configs/fsl-emb-nonhw.config
@@
-71,7
+71,6
@@
CONFIG_IP_ROUTE_MULTIPATH=y
CONFIG_IP_ROUTE_VERBOSE=y
CONFIG_IP_SCTP=m
CONFIG_IPV6=y
-CONFIG_IRQ_DOMAIN_DEBUG=y
CONFIG_ISO9660_FS=m
CONFIG_JFFS2_FS_DEBUG=1
CONFIG_JFFS2_FS=y