diff options
| author |  Arnd Bergmann <arnd@arndb.de>
| 2022-11-30 17:51:04 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de>
| 2022-11-30 17:51:05 +0100 |
| commit | 3880e0df2e149cbb67bf14dd8e35d8d4c403f22f (patch) | |
| tree | a4a68653ba8c644dc0ba37aa14b391941d714219 /arch/arm/configs/multi_v7_defconfig | |
| parent | arm64: defconfig: Enable Qualcomm SM6115 / SM4250 GCC and Pinctrl (diff) | |
| parent | ARM: configs: multi_v7: switch to new MICROCHIP_ISC driver (diff) | |
| download | linux-3880e0df2e149cbb67bf14dd8e35d8d4c403f22f.tar.gz linux-3880e0df2e149cbb67bf14dd8e35d8d4c403f22f.tar.bz2 linux-3880e0df2e149cbb67bf14dd8e35d8d4c403f22f.zip | |
Merge tag 'at91-defconfig-6.2-2' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/defconfig
AT91 defconfig for 6.2 #2
It contains:
- updates for defconfigs to use the new CONFIG_VIDEO_MICROCHIP_ISC,
CONFIG_VIDEO_MICROCHIP_XISC config flags that replaced the
CONFIG_VIDEO_ATMEL_ISC, CONFIG_VIDEO_ATMEL_XISC. Drivers under
CONFIG_VIDEO_ATMEL_* were moved to staging and considered deprecated.
* tag 'at91-defconfig-6.2-2' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: configs: multi_v7: switch to new MICROCHIP_ISC driver
ARM: configs: sama5/7: switch to new MICROCHIP_ISC driver
Link: https://lore.kernel.org/r/20221125142736.385654-1-claudiu.beznea@microchip.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/multi_v7_defconfig')
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 2b1de08b057e..ee184eb37adc 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -663,11 +663,11 @@ CONFIG_USB_VIDEO_CLASS=m CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_ASPEED=m -CONFIG_VIDEO_ATMEL_ISC=m -CONFIG_VIDEO_ATMEL_XISC=m CONFIG_VIDEO_ATMEL_ISI=m -CONFIG_VIDEO_MICROCHIP_CSI2DC=m CONFIG_VIDEO_MMP_CAMERA=m +CONFIG_VIDEO_MICROCHIP_ISC=m +CONFIG_VIDEO_MICROCHIP_XISC=m +CONFIG_VIDEO_MICROCHIP_CSI2DC=m CONFIG_VIDEO_TEGRA_VDE=m CONFIG_VIDEO_RENESAS_CEU=m CONFIG_VIDEO_RCAR_VIN=m |