Allwinner defconfig changes for 3.11

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.12 (GNU/Linux)
 
 iQIcBAABAgAGBQJRwX0FAAoJEBx+YmzsjxAgRmgQAJZJkx+HKowVtWISGTkSyXpi
 wjidgTew2EbBRJloPMkuUpe2RzipgQlVyxKl3BvjuaGKYVOPTSNtM0Tnwqf0mnsH
 EWNHe4+0iGpy4vfD2nNBxpw45IKPzo9hxRcDJ/rJ4stDAQedxD20odYln7NQHujd
 MF3fGeWNiuT2DT3ZFoc6ku362VDlXxs6hNvplRrzmI1+aaacKtOwuKJU7XBo0R0x
 x1zHvnqY2JiEXTz5O0LGKtsFZMnMY8Ykt8VGRyej5ajqwX+2laxumJU28qVTH7qZ
 wPpHgfO9Jtv9huwfnsqJ8Hg4IqUnzwKWoOfxnt33yRxJYU7q/LICv1a65Bjq7TcW
 BXblgDaqN9JB9k/jcJL9gz/PXCA/5GKlW0vht5L7e/LpbWbra1MutZMsJMODPCrI
 DDgd+rBVjd8yMasTGt4ISF1AUN1+UhdKTpMJyuLsyooqavGF6trwGo03/r7oqRje
 P2zu+nEs2uy9vp5/uNGY2LxFyb6Ls+u/u1YfBznpqA2MHrbMBkWSABJ4vqQneAd7
 S3mojbRWFL48cOB+BiJXwd3DIz+DCcG8/Ovp6vt9jKki3qn+pM0NEGmsfbnCzcgv
 aEbfrumvV0iTyMF5Ih7fWdU1T3iZ5usETfjLeQV9oO19VYt6tyObSaWcPUTYiwDe
 +5Yobg4MWukM79lZmZzC
 =bmqd
 -----END PGP SIGNATURE-----

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:
Arnd Bergmann 2013-06-20 15:26:08 +02:00
commit 025304a517

View file

@ -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