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
/
tilepro_defconfig
diff --git
a/arch/tile/configs/tilepro_defconfig
b/arch/tile/configs/tilepro_defconfig
index
6d9ce8a
..
ef9e27e
100644
(file)
--- a/
arch/tile/configs/tilepro_defconfig
+++ b/
arch/tile/configs/tilepro_defconfig
@@
-341,7
+341,7
@@
CONFIG_TUN=y
CONFIG_VETH=m
CONFIG_NET_DSA_MV88E6060=y
CONFIG_NET_DSA_MV88E6131=y
-CONFIG_NET_DSA_MV88E6123
_61_65
=y
+CONFIG_NET_DSA_MV88E6123=y
# CONFIG_NET_VENDOR_3COM is not set
CONFIG_E1000E=y
# CONFIG_WLAN is not set