diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2016-11-30 23:24:02 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-11-30 23:24:02 +0100 |
| commit | b1dbf794b97716576e7dbad8d299bd4bb54c6a71 (patch) | |
| tree | 71de64e42bdb0a22a34585fe1bc5b96f630bfc40 /arch/arm | |
| parent | ARM: defconfig: drop GPIO_SYSFS on multiplatforms (diff) | |
| parent | ARM: multi_v7_defconfig: enable STMicroelectronics HVA driver (diff) | |
| download | wireguard-linux-b1dbf794b97716576e7dbad8d299bd4bb54c6a71.tar.xz wireguard-linux-b1dbf794b97716576e7dbad8d299bd4bb54c6a71.zip | |
Merge tag 'sti-defconfig-for-4.10-round3' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 06fdc88bb4bb..d59ac42acccf 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -568,6 +568,7 @@ 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 |