update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/tuners/Kconfig
..
..
@@ -1,3 +1,4 @@
1
+# SPDX-License-Identifier: GPL-2.0-only
1
2
 # Analog TV tuners, auto-loaded via tuner.ko
2
3
 config MEDIA_TUNER
3
4
 	tristate
..
..
@@ -14,8 +15,12 @@
14
15
 	select MEDIA_TUNER_TDA9887 if MEDIA_SUBDRV_AUTOSELECT
15
16
 	select MEDIA_TUNER_MC44S803 if MEDIA_SUBDRV_AUTOSELECT
16
17
 
18
+comment "Tuner drivers auto-selected by 'Autoselect ancillary drivers'"
19
+	depends on MEDIA_HIDE_ANCILLARY_SUBDRV
20
+	depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT
21
+
17
22
 menu "Customize TV tuners"
18
-	visible if !MEDIA_SUBDRV_AUTOSELECT || COMPILE_TEST
23
+	visible if !MEDIA_HIDE_ANCILLARY_SUBDRV
19
24
 	depends on MEDIA_ANALOG_TV_SUPPORT || MEDIA_DIGITAL_TV_SUPPORT || MEDIA_RADIO_SUPPORT || MEDIA_SDR_SUPPORT
20
25
 
21
26
 config MEDIA_TUNER_SIMPLE
..
..
@@ -218,7 +223,7 @@
218
223
 
219
224
 config MEDIA_TUNER_E4000
220
225
 	tristate "Elonics E4000 silicon tuner"
221
-	depends on MEDIA_SUPPORT && I2C
226
+	depends on MEDIA_SUPPORT && I2C && VIDEO_V4L2
222
227
 	select REGMAP_I2C
223
228
 	default m if !MEDIA_SUBDRV_AUTOSELECT
224
229
 	help
..
..
@@ -226,7 +231,7 @@
226
231
 
227
232
 config MEDIA_TUNER_FC2580
228
233
 	tristate "FCI FC2580 silicon tuner"
229
-	depends on MEDIA_SUPPORT && I2C
234
+	depends on MEDIA_SUPPORT && I2C && VIDEO_V4L2
230
235
 	select REGMAP_I2C
231
236
 	default m if !MEDIA_SUBDRV_AUTOSELECT
232
237
 	help