diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-19 11:40:14 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-19 11:40:14 -0800 |
| commit | 3f0b736a9867ef160c6abd6602cce23686e2a637 (patch) | |
| tree | 387eee167f928bd30582dc82160c00c1517da64e /arch/arm/configs | |
| parent | baf41b32d8d89824d257d52e472f8fd71be18872 (diff) | |
| parent | a1b282911b47a522f150eb715fb037628c5173fe (diff) | |
Merge tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91 into next/defconfig
Merge "at91: defconfig for 3.20 #1" from Nicolas Ferre:
First batch of defconfig update for 3.20:
- we remove DEBUG_LL from sama5 defconfig as all SoC are not compatible
- enable ISI and selected sensors
* tag 'at91-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91:
ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig
ARM: at91/config: sama5: Remove DEBUG_LL
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/sama5_defconfig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig index afa24799477a..41d856effe6c 100644 --- a/arch/arm/configs/sama5_defconfig +++ b/arch/arm/configs/sama5_defconfig @@ -139,6 +139,12 @@ CONFIG_POWER_RESET=y CONFIG_SSB=m CONFIG_REGULATOR=y CONFIG_REGULATOR_ACT8865=y +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_SOC_CAMERA=y +CONFIG_SOC_CAMERA_OV2640=y +CONFIG_VIDEO_ATMEL_ISI=y CONFIG_FB=y CONFIG_BACKLIGHT_LCD_SUPPORT=y # CONFIG_LCD_CLASS_DEVICE is not set @@ -202,8 +208,6 @@ CONFIG_DEBUG_MEMORY_INIT=y # CONFIG_SCHED_DEBUG is not set # CONFIG_FTRACE is not set CONFIG_DEBUG_USER=y -CONFIG_DEBUG_LL=y -CONFIG_EARLY_PRINTK=y # CONFIG_CRYPTO_ANSI_CPRNG is not set CONFIG_CRYPTO_USER_API_HASH=m CONFIG_CRYPTO_USER_API_SKCIPHER=m |