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>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user