diff options
| author | Olof Johansson <olof@lixom.net> | 2013-10-07 11:37:34 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-10-07 11:37:34 -0700 |
| commit | d174ec22872c35d5ce1d223072bc8bd12ad1fef4 (patch) | |
| tree | 3149ee6e2a81e30f06602e1eec10f2e06bb53390 /arch/arm/configs/marzen_defconfig | |
| parent | 586eeb01e723c80ea53a2897123642e68304d70c (diff) | |
| parent | 6bb2e347899b297eea26f2658eac8fdcd633fba5 (diff) | |
Merge tag 'renesas-defconfig-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
From Simon Horman:
Renesas ARM based SoC defconfig updates for v3.13
* Add defconfig for koelsch board
* Enable sound in defconfig for bockw board
* Enable R-Car DU DRM in defconfig for lager and marzen boards
* tag 'renesas-defconfig-for-v3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Add koelsch defconfig
ARM: shmobile: bockw defconfig: add Sound support
ARM: shmobile: lager: Select DRM_RCAR_DU in defconfig
ARM: shmobile: marzen: Select DRM_RCAR_DU in defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs/marzen_defconfig')
| -rw-r--r-- | arch/arm/configs/marzen_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index 000e9205b2b9..5cc6360340b1 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig @@ -92,6 +92,8 @@ CONFIG_SOC_CAMERA=y CONFIG_VIDEO_RCAR_VIN=y # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set CONFIG_VIDEO_ADV7180=y +CONFIG_DRM=y +CONFIG_DRM_RCAR_DU=y CONFIG_USB=y CONFIG_USB_RCAR_PHY=y CONFIG_MMC=y |