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

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