aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/at91sam9260_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/at91sam9260_defconfig
parent85d096db6764fd89cea232cf64b65a5f3b0f1ffc (diff)
downloadkernel_samsung_smdk4412-9f939adeb2d0bcc079a8b2684761b34709d65407.zip
kernel_samsung_smdk4412-9f939adeb2d0bcc079a8b2684761b34709d65407.tar.gz
kernel_samsung_smdk4412-9f939adeb2d0bcc079a8b2684761b34709d65407.tar.bz2
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/at91sam9260_defconfig')
-rw-r--r--arch/arm/configs/at91sam9260_defconfig4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/configs/at91sam9260_defconfig b/arch/arm/configs/at91sam9260_defconfig
index f8a9226..8a4c22d 100644
--- a/arch/arm/configs/at91sam9260_defconfig
+++ b/arch/arm/configs/at91sam9260_defconfig
@@ -33,12 +33,10 @@ CONFIG_IP_PNP_BOOTP=y
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
CONFIG_BLK_DEV_RAM=y
CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_ATMEL_SSC=y
CONFIG_SCSI=y
CONFIG_BLK_DEV_SD=y
CONFIG_SCSI_MULTI_LUN=y
CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
CONFIG_MII=y
CONFIG_MACB=y
# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
@@ -55,7 +53,6 @@ CONFIG_I2C_GPIO=y
CONFIG_WATCHDOG=y
CONFIG_WATCHDOG_NOWAYOUT=y
CONFIG_AT91SAM9X_WATCHDOG=y
-# CONFIG_VGA_CONSOLE is not set
# CONFIG_USB_HID is not set
CONFIG_USB=y
CONFIG_USB_DEVICEFS=y
@@ -71,7 +68,6 @@ CONFIG_USB_G_SERIAL=m
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_AT91SAM9=y
CONFIG_EXT2_FS=y
-CONFIG_INOTIFY=y
CONFIG_VFAT_FS=y
CONFIG_TMPFS=y
CONFIG_CRAMFS=y