From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 14 Jul 2016 13:11:40 +0000 (+0200)
Subject: Merge tag 'sti-defconfig-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.8-rc1~68^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa3533e778d9189d242929a795b438587df69110;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'sti-defconfig-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti into next/defconfig

Merge "STi defconfig updates for v4.8" from Patrice Chotard:

- Enable DRM_STI for STMicroelectronics DRM Support
- VIDEO_STI_BDISP for STMicroelectronics BDISP 2D

* tag 'sti-defconfig-for-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
  ARM: multi_v7_defconfig: enable STMicroelectronics DRM Support
  ARM: multi_v7_defconfig: enable STMicroelectronics BDISP 2D blitter driver
---

fa3533e778d9189d242929a795b438587df69110
diff --cc arch/arm/configs/multi_v7_defconfig
index 8d189350e8ba2,42741a5884139..7fd209c5ea478
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -547,17 -526,10 +547,18 @@@ CONFIG_SOC_CAMERA=
  CONFIG_SOC_CAMERA_PLATFORM=m
  CONFIG_VIDEO_RCAR_VIN=m
  CONFIG_VIDEO_ATMEL_ISI=m
 +CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=m
 +CONFIG_VIDEO_S5P_FIMC=m
 +CONFIG_VIDEO_S5P_MIPI_CSIS=m
 +CONFIG_VIDEO_EXYNOS_FIMC_LITE=m
 +CONFIG_VIDEO_EXYNOS4_FIMC_IS=m
  CONFIG_V4L_MEM2MEM_DRIVERS=y
 +CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 +CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
+ CONFIG_VIDEO_STI_BDISP=m
  CONFIG_VIDEO_RENESAS_JPU=m
  CONFIG_VIDEO_RENESAS_VSP1=m
 +CONFIG_V4L_TEST_DRIVERS=y
  # CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
  CONFIG_VIDEO_ADV7180=m
  CONFIG_VIDEO_ML86V7667=m
@@@ -583,11 -553,10 +584,12 @@@ CONFIG_DRM_ATMEL_HLCDC=
  CONFIG_DRM_RCAR_DU=m
  CONFIG_DRM_RCAR_HDMI=y
  CONFIG_DRM_RCAR_LVDS=y
 +CONFIG_DRM_SUN4I=m
  CONFIG_DRM_TEGRA=y
 +CONFIG_DRM_PANEL_SAMSUNG_LD9040=m
  CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
  CONFIG_DRM_PANEL_SIMPLE=y
+ CONFIG_DRM_STI=m
  CONFIG_DRM_VC4=y
  CONFIG_FB_ARMCLCD=y
  CONFIG_FB_WM8505=y