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
c1387b7
..
3f3dfb8
100644
(file)
--- a/
arch/tile/configs/tilegx_defconfig
+++ b/
arch/tile/configs/tilegx_defconfig
@@
-222,7
+222,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_SKY2=y
CONFIG_PTP_1588_CLOCK_TILEGX=y
# CONFIG_WLAN is not set