diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-24 14:58:59 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-24 14:58:59 +0000 |
| commit | 597b97cab66da331ae9e19e728601e62542a7ca8 (patch) | |
| tree | 2729bfc6dac1c540f094cbd8701a3de5e340c0e3 /arch/arm/configs/at91sam9g45_defconfig | |
| parent | 626e3677a2cb59f8afb9caef3f58c4685587986a (diff) | |
| parent | db5509f0c2b7e7c02e1294a10a4d4b04f2720c28 (diff) | |
| download | blackbird-obmc-linux-597b97cab66da331ae9e19e728601e62542a7ca8.tar.gz blackbird-obmc-linux-597b97cab66da331ae9e19e728601e62542a7ca8.zip | |
Merge branch 'at91/defconfig' into fixes
Diffstat (limited to 'arch/arm/configs/at91sam9g45_defconfig')
| -rw-r--r-- | arch/arm/configs/at91sam9g45_defconfig | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/arch/arm/configs/at91sam9g45_defconfig b/arch/arm/configs/at91sam9g45_defconfig index c5876d244f4b..606d48f3b8f8 100644 --- a/arch/arm/configs/at91sam9g45_defconfig +++ b/arch/arm/configs/at91sam9g45_defconfig @@ -18,6 +18,7 @@ CONFIG_MODULE_UNLOAD=y CONFIG_ARCH_AT91=y CONFIG_ARCH_AT91SAM9G45=y CONFIG_MACH_AT91SAM9M10G45EK=y +CONFIG_MACH_AT91SAM_DT=y CONFIG_AT91_PROGRAMMABLE_CLOCKS=y CONFIG_AT91_SLOW_CLOCK=y CONFIG_AEABI=y @@ -73,11 +74,8 @@ CONFIG_SCSI_MULTI_LUN=y # CONFIG_SCSI_LOWLEVEL is not set CONFIG_NETDEVICES=y CONFIG_MII=y -CONFIG_DAVICOM_PHY=y -CONFIG_NET_ETHERNET=y CONFIG_MACB=y -# CONFIG_NETDEV_1000 is not set -# CONFIG_NETDEV_10000 is not set +CONFIG_DAVICOM_PHY=y CONFIG_LIBERTAS_THINFIRM=m CONFIG_LIBERTAS_THINFIRM_USB=m CONFIG_AT76C50X_USB=m @@ -131,7 +129,6 @@ CONFIG_I2C_GPIO=y CONFIG_SPI=y CONFIG_SPI_ATMEL=y # CONFIG_HWMON is not set -# CONFIG_MFD_SUPPORT is not set CONFIG_FB=y CONFIG_FB_ATMEL=y CONFIG_FB_UDL=m |
