summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/at91sam9g45_defconfig
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2011-10-16 00:07:20 +0800
committerArnd Bergmann <arnd@arndb.de>2011-11-24 14:57:54 +0000
commit9f939adeb2d0bcc079a8b2684761b34709d65407 (patch)
treec2a702ed496fc87b4db1be8e21d86275a1bdc5f9 /arch/arm/configs/at91sam9g45_defconfig
parent85d096db6764fd89cea232cf64b65a5f3b0f1ffc (diff)
downloadop-kernel-dev-9f939adeb2d0bcc079a8b2684761b34709d65407.zip
op-kernel-dev-9f939adeb2d0bcc079a8b2684761b34709d65407.tar.gz
ARM: at91: refresh soc defconfig files for 3.2
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Cc: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/at91sam9g45_defconfig')
-rw-r--r--arch/arm/configs/at91sam9g45_defconfig6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/configs/at91sam9g45_defconfig b/arch/arm/configs/at91sam9g45_defconfig
index c5876d2..7f8f999 100644
--- a/arch/arm/configs/at91sam9g45_defconfig
+++ b/arch/arm/configs/at91sam9g45_defconfig
@@ -73,11 +73,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 +128,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
OpenPOWER on IntegriCloud