projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pinctrl-v3.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[cascardo/linux.git]
/
arch
/
arm
/
configs
/
multi_v5_defconfig
diff --git
a/arch/arm/configs/multi_v5_defconfig
b/arch/arm/configs/multi_v5_defconfig
index
018bef9
..
9d56781
100644
(file)
--- a/
arch/arm/configs/multi_v5_defconfig
+++ b/
arch/arm/configs/multi_v5_defconfig
@@
-67,9
+67,11
@@
CONFIG_SATA_AHCI=y
CONFIG_SATA_MV=y
CONFIG_NETDEVICES=y
CONFIG_NET_DSA_MV88E6123_61_65=y
+CONFIG_NET_DSA_MV88E6171=y
CONFIG_MV643XX_ETH=y
CONFIG_R8169=y
CONFIG_MARVELL_PHY=y
+CONFIG_MWL8K=m
CONFIG_LIBERTAS=y
CONFIG_LIBERTAS_SDIO=y
CONFIG_INPUT_EVDEV=y