From: Arnd Bergmann <arnd@arndb.de>
Date: Wed, 30 Nov 2016 22:24:02 +0000 (+0100)
Subject: Merge tag 'sti-defconfig-for-4.10-round3' of git://git.kernel.org/pub/scm/linux/kerne... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b1dbf794b97716576e7dbad8d299bd4bb54c6a71;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge tag 'sti-defconfig-for-4.10-round3' of git://git./linux/kernel/git/pchotard/sti into next/defconfig

Pull "STi defconfig fix" from Patrice Chotard:

Enable HVA (Hardware Video Accelerator) video encoder
driver for STMicroelectronics SoC.

* tag 'sti-defconfig-for-4.10-round3' of git://git.kernel.org/pub/scm/linux/kernel/git/pchotard/sti:
  ARM: multi_v7_defconfig: enable STMicroelectronics HVA driver
---

b1dbf794b97716576e7dbad8d299bd4bb54c6a71
diff --cc arch/arm/configs/multi_v7_defconfig
index 06fdc88bb4bb,5109182450ed..d59ac42acccf
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -566,8 -560,8 +566,9 @@@ CONFIG_VIDEO_EXYNOS4_FIMC_IS=
  CONFIG_V4L_MEM2MEM_DRIVERS=y
  CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
  CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
 +CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
  CONFIG_VIDEO_STI_BDISP=m
+ CONFIG_VIDEO_STI_HVA=m
  CONFIG_VIDEO_RENESAS_JPU=m
  CONFIG_VIDEO_RENESAS_VSP1=m
  CONFIG_V4L_TEST_DRIVERS=y