summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-20 15:26:08 +0200
committerArnd Bergmann <arnd@arndb.de>2013-06-20 15:26:08 +0200
commit025304a517dce66b270f89a5d6a82191dd3838c6 (patch)
tree4cb2046ab468cc708d7779ae0277d2380be47b94
parenta0639948b6fb28ebf2063b58ae6e0f4de693f6c3 (diff)
parentfb1c60288a886a28dc7c055449fd1936140fe891 (diff)
downloadblackbird-op-linux-025304a517dce66b270f89a5d6a82191dd3838c6.tar.gz
blackbird-op-linux-025304a517dce66b270f89a5d6a82191dd3838c6.zip
Merge tag 'sunxi-defconfig-for-3.11' of git://github.com/mripard/linux into next/soc
From Maxime Ripard: Allwinner defconfig changes for 3.11 * tag 'sunxi-defconfig-for-3.11' of git://github.com/mripard/linux: ARM: multi_v7: Enable Allwinner EMAC in multi_v7_defconfig Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r--arch/arm/configs/multi_v7_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 2e67a272df70..4aa640106611 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -31,10 +31,12 @@ CONFIG_SATA_HIGHBANK=y
CONFIG_SATA_MV=y
CONFIG_SATA_AHCI_PLATFORM=y
CONFIG_NETDEVICES=y
+CONFIG_SUN4I_EMAC=y
CONFIG_NET_CALXEDA_XGMAC=y
CONFIG_SMSC911X=y
CONFIG_STMMAC_ETH=y
CONFIG_SERIO_AMBAKMI=y
+CONFIG_MDIO_SUN4I=y
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_DW=y
OpenPOWER on IntegriCloud