diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-05-22 20:01:22 +0400 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-05-22 20:01:22 +0400 |
| commit | 6a84872a3c3090993be108f02f91b4de062a7d32 (patch) | |
| tree | eb9029dda4b56efdc1488a8683c00c711075ca18 /arch/arm/configs/at91sam9rl_defconfig | |
| parent | d82b40133f2a7d50e491cecb64e4ea01dabd8672 (diff) | |
| parent | 138e8f1c4e99cd349e50fd8b18aebbd2716ceb87 (diff) | |
| download | linux-6a84872a3c3090993be108f02f91b4de062a7d32.tar.xz | |
Merge branch 'at91-3.16-cleanup' into at91-3.16-dt3
Diffstat (limited to 'arch/arm/configs/at91sam9rl_defconfig')
| -rw-r--r-- | arch/arm/configs/at91sam9rl_defconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/configs/at91sam9rl_defconfig b/arch/arm/configs/at91sam9rl_defconfig index 85f846ae9ff2..5d7797d43d23 100644 --- a/arch/arm/configs/at91sam9rl_defconfig +++ b/arch/arm/configs/at91sam9rl_defconfig @@ -45,7 +45,6 @@ CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_TOUCHSCREEN_ATMEL_TSADCC=y # CONFIG_SERIO is not set CONFIG_SERIAL_ATMEL=y CONFIG_SERIAL_ATMEL_CONSOLE=y @@ -65,6 +64,8 @@ CONFIG_MMC=y CONFIG_MMC_ATMELMCI=m CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_AT91SAM9=y +CONFIG_IIO=y +CONFIG_AT91_ADC=y CONFIG_EXT2_FS=y CONFIG_MSDOS_FS=y CONFIG_VFAT_FS=y |