commit 2ea336dc117098ef917ca9a19e911d15490587cc · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

V4L/DVB (7899): Fixes a few remaining Kbuild issues at common/tuners

- MEDIA_ATTACH now applies also for V4L;

- select a FW_LOADER dependent driver should happen only if HOTPLUG;

- apply the common tuner dependency to all tuners. This helps to avoid latter
issues.

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

Mauro Carvalho Chehab 18 years ago 2ea336dc 039d4001

+17 -3

1 changed file

expand all

unified split

drivers

media

common

tuners

Kconfig

+17 -3

drivers/media/common/tuners/Kconfig

··· 1 1 config MEDIA_ATTACH 2 2 bool "Load and attach frontend and tuner driver modules as needed" 3 - depends on DVB_CORE 3 + depends on VIDEO_MEDIA 4 4 depends on MODULES 5 5 help 6 6 Remove the static dependency of DVB card drivers on all ··· 22 22 default VIDEO_MEDIA && I2C 23 23 depends on VIDEO_MEDIA && I2C 24 24 select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG 25 - select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE 25 + select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG 26 26 select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMIZE 27 27 select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE 28 28 select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMIZE ··· 46 46 47 47 config MEDIA_TUNER_SIMPLE 48 48 tristate "Simple tuner support" 49 + depends on VIDEO_MEDIA && I2C 49 50 select MEDIA_TUNER_TDA9887 50 51 default m if MEDIA_TUNER_CUSTOMIZE 51 52 help ··· 54 53 55 54 config MEDIA_TUNER_TDA8290 56 55 tristate "TDA 8290/8295 + 8275(a)/18271 tuner combo" 56 + depends on VIDEO_MEDIA && I2C 57 57 select MEDIA_TUNER_TDA827X 58 58 select MEDIA_TUNER_TDA18271 59 59 default m if MEDIA_TUNER_CUSTOMIZE ··· 63 61 64 62 config MEDIA_TUNER_TDA827X 65 63 tristate "Philips TDA827X silicon tuner" 64 + depends on VIDEO_MEDIA && I2C 66 65 default m if DVB_FE_CUSTOMISE 67 66 help 68 67 A DVB-T silicon tuner module. Say Y when you want to support this tuner. 69 68 70 69 config MEDIA_TUNER_TDA18271 71 70 tristate "NXP TDA18271 silicon tuner" 71 + depends on VIDEO_MEDIA && I2C 72 72 default m if DVB_FE_CUSTOMISE 73 73 help 74 74 A silicon tuner module. Say Y when you want to support this tuner. 75 75 76 76 config MEDIA_TUNER_TDA9887 77 77 tristate "TDA 9885/6/7 analog IF demodulator" 78 + depends on VIDEO_MEDIA && I2C 78 79 default m if MEDIA_TUNER_CUSTOMIZE 79 80 help 80 81 Say Y here to include support for Philips TDA9885/6/7 ··· 85 80 86 81 config MEDIA_TUNER_TEA5761 87 82 tristate "TEA 5761 radio tuner (EXPERIMENTAL)" 83 + depends on VIDEO_MEDIA && I2C 88 84 depends on EXPERIMENTAL 89 85 default m if MEDIA_TUNER_CUSTOMIZE 90 86 help ··· 93 87 94 88 config MEDIA_TUNER_TEA5767 95 89 tristate "TEA 5767 radio tuner" 90 + depends on VIDEO_MEDIA && I2C 96 91 default m if MEDIA_TUNER_CUSTOMIZE 97 92 help 98 93 Say Y here to include support for the Philips TEA5767 radio tuner. 99 94 100 95 config MEDIA_TUNER_MT20XX 101 96 tristate "Microtune 2032 / 2050 tuners" 97 + depends on VIDEO_MEDIA && I2C 102 98 default m if MEDIA_TUNER_CUSTOMIZE 103 99 help 104 100 Say Y here to include support for the MT2032 / MT2050 tuner. 105 101 106 102 config MEDIA_TUNER_MT2060 107 103 tristate "Microtune MT2060 silicon IF tuner" 104 + depends on VIDEO_MEDIA && I2C 108 105 default m if DVB_FE_CUSTOMISE 109 106 help 110 107 A driver for the silicon IF tuner MT2060 from Microtune. 111 108 112 109 config MEDIA_TUNER_MT2266 113 110 tristate "Microtune MT2266 silicon tuner" 111 + depends on VIDEO_MEDIA && I2C 114 112 default m if DVB_FE_CUSTOMISE 115 113 help 116 114 A driver for the silicon baseband tuner MT2266 from Microtune. 117 115 118 116 config MEDIA_TUNER_MT2131 119 117 tristate "Microtune MT2131 silicon tuner" 118 + depends on VIDEO_MEDIA && I2C 120 119 default m if DVB_FE_CUSTOMISE 121 120 help 122 121 A driver for the silicon baseband tuner MT2131 from Microtune. 123 122 124 123 config MEDIA_TUNER_QT1010 125 124 tristate "Quantek QT1010 silicon tuner" 125 + depends on VIDEO_MEDIA && I2C 126 126 default m if DVB_FE_CUSTOMISE 127 127 help 128 128 A driver for the silicon tuner QT1010 from Quantek. 129 129 130 130 config MEDIA_TUNER_XC2028 131 131 tristate "XCeive xc2028/xc3028 tuners" 132 + depends on VIDEO_MEDIA && I2C 132 133 depends on HOTPLUG 133 134 select FW_LOADER 134 135 default m if MEDIA_TUNER_CUSTOMIZE ··· 144 131 145 132 config MEDIA_TUNER_XC5000 146 133 tristate "Xceive XC5000 silicon tuner" 134 + depends on VIDEO_MEDIA && I2C 147 135 depends on HOTPLUG 148 136 select FW_LOADER 149 137 default m if DVB_FE_CUSTOMISE ··· 155 141 156 142 config MEDIA_TUNER_MXL5005S 157 143 tristate "MaxLinear MSL5005S silicon tuner" 158 - depends on I2C 144 + depends on VIDEO_MEDIA && I2C 159 145 default m if DVB_FE_CUSTOMISE 160 146 help 161 147 A driver for the silicon tuner MXL5005S from MaxLinear.