Commit d4ff08d6 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'at91-defconfig-5.11' of...

Merge tag 'at91-defconfig-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/defconfig

AT91 defconfig for 5.11:

 - filter compiled media drivers

* tag 'at91-defconfig-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: configs: at91_dt: resync with media changes
  ARM: configs: at91: sama5: resync with media changes

Link: https://lore.kernel.org/r/20201127215517.GA1733715@piout.netSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents aa26d828 036f224e
...@@ -124,9 +124,14 @@ CONFIG_MFD_ATMEL_HLCDC=y ...@@ -124,9 +124,14 @@ CONFIG_MFD_ATMEL_HLCDC=y
CONFIG_REGULATOR=y CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_SUPPORT_FILTER=y
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_PLATFORM_SUPPORT=y
CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_ATMEL_ISI=y CONFIG_VIDEO_ATMEL_ISI=y
CONFIG_VIDEO_OV2640=m
CONFIG_VIDEO_MT9V032=m
CONFIG_DRM=y CONFIG_DRM=y
CONFIG_DRM_ATMEL_HLCDC=y CONFIG_DRM_ATMEL_HLCDC=y
CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_SIMPLE=y
......
...@@ -153,9 +153,18 @@ CONFIG_REGULATOR_ACT8945A=y ...@@ -153,9 +153,18 @@ CONFIG_REGULATOR_ACT8945A=y
CONFIG_REGULATOR_MCP16502=m CONFIG_REGULATOR_MCP16502=m
CONFIG_REGULATOR_PWM=m CONFIG_REGULATOR_PWM=m
CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_SUPPORT=y
CONFIG_MEDIA_SUPPORT_FILTER=y
# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y
CONFIG_MEDIA_PLATFORM_SUPPORT=y
CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_PLATFORM_DRIVERS=y
CONFIG_VIDEO_ATMEL_ISC=y
CONFIG_VIDEO_ATMEL_ISI=y CONFIG_VIDEO_ATMEL_ISI=y
CONFIG_VIDEO_OV2640=m
CONFIG_VIDEO_OV5640=m
CONFIG_VIDEO_OV7670=m
CONFIG_VIDEO_OV7740=m
CONFIG_VIDEO_MT9V032=m
CONFIG_DRM=y CONFIG_DRM=y
CONFIG_DRM_ATMEL_HLCDC=y CONFIG_DRM_ATMEL_HLCDC=y
CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_PANEL_SIMPLE=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment