From 6de8199090251c5ad9dbc5415bcbffb3da15cc69 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Tue, 18 Oct 2022 15:34:39 +0100 Subject: [PATCH 453/726] configs: Re-enable some deprecated media drivers Signed-off-by: Phil Elwell --- arch/arm/configs/bcm2709_defconfig | 11 ++++++----- arch/arm/configs/bcm2711_defconfig | 11 ++++++----- arch/arm/configs/bcmrpi_defconfig | 11 ++++++----- arch/arm64/configs/bcm2711_defconfig | 6 ++++++ arch/arm64/configs/bcmrpi3_defconfig | 6 ++++++ 5 files changed, 30 insertions(+), 15 deletions(-) diff --git a/arch/arm/configs/bcm2709_defconfig b/arch/arm/configs/bcm2709_defconfig index 01e901e5fc4c..e260a9665167 100644 --- a/arch/arm/configs/bcm2709_defconfig +++ b/arch/arm/configs/bcm2709_defconfig @@ -779,7 +779,6 @@ CONFIG_RC_LOOPBACK=m CONFIG_MEDIA_CEC_RC=y CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_VIDEO_CPIA2=m CONFIG_USB_GSPCA=m CONFIG_USB_GSPCA_BENQ=m CONFIG_USB_GSPCA_CONEX=m @@ -834,7 +833,6 @@ CONFIG_USB_PWC=m CONFIG_USB_S2255=m CONFIG_VIDEO_USBTV=m CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_ZR364XX=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m @@ -846,9 +844,6 @@ CONFIG_VIDEO_AU0828_RC=y CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_ALSA=m CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_TM6000_DVB=m CONFIG_DVB_AS102=m CONFIG_DVB_B2C2_FLEXCOP_USB=m CONFIG_DVB_USB_V2=m @@ -1329,6 +1324,12 @@ CONFIG_R8712U=m CONFIG_R8188EU=m CONFIG_VT6656=m CONFIG_STAGING_MEDIA=y +CONFIG_STAGING_MEDIA_DEPRECATED=y +CONFIG_VIDEO_CPIA2=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m +CONFIG_USB_ZR364XX=m CONFIG_FB_TFT=m CONFIG_FB_TFT_AGM1264K_FL=m CONFIG_FB_TFT_BD663474=m diff --git a/arch/arm/configs/bcm2711_defconfig b/arch/arm/configs/bcm2711_defconfig index 4a40b230ecb2..d406b64f0a8e 100644 --- a/arch/arm/configs/bcm2711_defconfig +++ b/arch/arm/configs/bcm2711_defconfig @@ -797,7 +797,6 @@ CONFIG_RC_LOOPBACK=m CONFIG_MEDIA_CEC_RC=y CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_VIDEO_CPIA2=m CONFIG_USB_GSPCA=m CONFIG_USB_GSPCA_BENQ=m CONFIG_USB_GSPCA_CONEX=m @@ -852,7 +851,6 @@ CONFIG_USB_PWC=m CONFIG_USB_S2255=m CONFIG_VIDEO_USBTV=m CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_ZR364XX=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m @@ -864,9 +862,6 @@ CONFIG_VIDEO_AU0828_RC=y CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_ALSA=m CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_TM6000_DVB=m CONFIG_DVB_AS102=m CONFIG_DVB_B2C2_FLEXCOP_USB=m CONFIG_DVB_USB_V2=m @@ -1353,6 +1348,12 @@ CONFIG_R8188EU=m CONFIG_VT6656=m CONFIG_STAGING_MEDIA=y CONFIG_VIDEO_RPIVID=m +CONFIG_STAGING_MEDIA_DEPRECATED=y +CONFIG_VIDEO_CPIA2=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m +CONFIG_USB_ZR364XX=m CONFIG_FB_TFT=m CONFIG_FB_TFT_AGM1264K_FL=m CONFIG_FB_TFT_BD663474=m diff --git a/arch/arm/configs/bcmrpi_defconfig b/arch/arm/configs/bcmrpi_defconfig index bd11c96d371b..bf4710a39ddd 100644 --- a/arch/arm/configs/bcmrpi_defconfig +++ b/arch/arm/configs/bcmrpi_defconfig @@ -773,7 +773,6 @@ CONFIG_RC_LOOPBACK=m CONFIG_MEDIA_CEC_RC=y CONFIG_MEDIA_SUPPORT=m CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_VIDEO_CPIA2=m CONFIG_USB_GSPCA=m CONFIG_USB_GSPCA_BENQ=m CONFIG_USB_GSPCA_CONEX=m @@ -828,7 +827,6 @@ CONFIG_USB_PWC=m CONFIG_USB_S2255=m CONFIG_VIDEO_USBTV=m CONFIG_USB_VIDEO_CLASS=m -CONFIG_USB_ZR364XX=m CONFIG_VIDEO_GO7007=m CONFIG_VIDEO_GO7007_USB=m CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m @@ -840,9 +838,6 @@ CONFIG_VIDEO_AU0828_RC=y CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_ALSA=m CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_TM6000_DVB=m CONFIG_DVB_AS102=m CONFIG_DVB_B2C2_FLEXCOP_USB=m CONFIG_DVB_USB_V2=m @@ -1322,6 +1317,12 @@ CONFIG_R8712U=m CONFIG_R8188EU=m CONFIG_VT6656=m CONFIG_STAGING_MEDIA=y +CONFIG_STAGING_MEDIA_DEPRECATED=y +CONFIG_VIDEO_CPIA2=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m +CONFIG_USB_ZR364XX=m CONFIG_FB_TFT=m CONFIG_FB_TFT_AGM1264K_FL=m CONFIG_FB_TFT_BD663474=m diff --git a/arch/arm64/configs/bcm2711_defconfig b/arch/arm64/configs/bcm2711_defconfig index 2486ed5567be..4a3c1ca610ac 100644 --- a/arch/arm64/configs/bcm2711_defconfig +++ b/arch/arm64/configs/bcm2711_defconfig @@ -1363,6 +1363,12 @@ CONFIG_R8188EU=m CONFIG_VT6656=m CONFIG_STAGING_MEDIA=y CONFIG_VIDEO_RPIVID=m +CONFIG_STAGING_MEDIA_DEPRECATED=y +CONFIG_VIDEO_CPIA2=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m +CONFIG_USB_ZR364XX=m CONFIG_FB_TFT=m CONFIG_FB_TFT_AGM1264K_FL=m CONFIG_FB_TFT_BD663474=m diff --git a/arch/arm64/configs/bcmrpi3_defconfig b/arch/arm64/configs/bcmrpi3_defconfig index e4a7e0427c62..513205895c4a 100644 --- a/arch/arm64/configs/bcmrpi3_defconfig +++ b/arch/arm64/configs/bcmrpi3_defconfig @@ -1262,6 +1262,12 @@ CONFIG_R8712U=m CONFIG_R8188EU=m CONFIG_VT6656=m CONFIG_STAGING_MEDIA=y +CONFIG_STAGING_MEDIA_DEPRECATED=y +CONFIG_VIDEO_CPIA2=m +CONFIG_VIDEO_TM6000=m +CONFIG_VIDEO_TM6000_ALSA=m +CONFIG_VIDEO_TM6000_DVB=m +CONFIG_USB_ZR364XX=m CONFIG_FB_TFT=m CONFIG_FB_TFT_AGM1264K_FL=m CONFIG_FB_TFT_BD663474=m -- 2.33.1