projects
/
cascardo
/
linux.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
[cascardo/linux.git]
/
arch
/
powerpc
/
configs
/
pseries_le_defconfig
diff --git
a/arch/powerpc/configs/pseries_le_defconfig
b/arch/powerpc/configs/pseries_le_defconfig
index
d200888
..
ac7ca58
100644
(file)
--- a/
arch/powerpc/configs/pseries_le_defconfig
+++ b/
arch/powerpc/configs/pseries_le_defconfig
@@
-134,7
+134,6
@@
CONFIG_DM_UEVENT=y
CONFIG_BONDING=m
CONFIG_DUMMY=m
CONFIG_NETCONSOLE=y
-CONFIG_NETPOLL_TRAP=y
CONFIG_TUN=m
CONFIG_VIRTIO_NET=m
CONFIG_VHOST_NET=m