diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-29 18:00:24 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-29 18:00:24 +0100 |
| commit | 95e0d11f2dba54c1b0066e414d2b88a95908da9e (patch) | |
| tree | 90e16c61ae130899195bf20dbdba97fa90b2345d | |
| parent | Merge branch 'armsoc/board' of git://github.com/hzhuang1/linux into next/boards (diff) | |
| parent | ARM: mach-shmobile: mackerel: enable VFP in defconfig (diff) | |
| download | linux-95e0d11f2dba54c1b0066e414d2b88a95908da9e.tar.xz linux-95e0d11f2dba54c1b0066e414d2b88a95908da9e.zip | |
Merge branch 'defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
From Simon Horman, two more defconfig updates for shmobile.
* 'defconfig2' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: mach-shmobile: mackerel: enable VFP in defconfig
ARM: mach-shmobile: armadillo: defconfig: Enable CEU
| -rw-r--r-- | arch/arm/configs/armadillo800eva_defconfig | 5 | ||||
| -rw-r--r-- | arch/arm/configs/mackerel_defconfig | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/configs/armadillo800eva_defconfig b/arch/arm/configs/armadillo800eva_defconfig index f9e270149a77..0b98100d2ae7 100644 --- a/arch/arm/configs/armadillo800eva_defconfig +++ b/arch/arm/configs/armadillo800eva_defconfig @@ -90,14 +90,11 @@ CONFIG_I2C_SH_MOBILE=y # CONFIG_HWMON is not set CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_DEV=y -# CONFIG_RC_CORE is not set -# CONFIG_VIDEO_HELPER_CHIPS_AUTO is not set -# CONFIG_V4L_USB_DRIVERS is not set +CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_SOC_CAMERA=y CONFIG_SOC_CAMERA_MT9T112=y CONFIG_VIDEO_SH_MOBILE_CEU=y -# CONFIG_RADIO_ADAPTERS is not set CONFIG_FB=y CONFIG_FB_SH_MOBILE_LCDC=y CONFIG_FB_SH_MOBILE_HDMI=y diff --git a/arch/arm/configs/mackerel_defconfig b/arch/arm/configs/mackerel_defconfig index e6881accf96a..7594b3aff259 100644 --- a/arch/arm/configs/mackerel_defconfig +++ b/arch/arm/configs/mackerel_defconfig @@ -25,6 +25,7 @@ CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ARM_APPENDED_DTB=y CONFIG_KEXEC=y +CONFIG_VFP=y # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set CONFIG_PM=y CONFIG_PM_RUNTIME=y |