diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-06 12:44:03 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-05-14 01:54:07 -0400 |
commit | eabcaf32041fcd04672049e76124bd4cd63b1cbf (patch) | |
tree | d3a8ddcbb6f2a6335872a9b90d7e7385033ed430 | |
parent | 3929c0f9acc62a2fee99387b3cb58fd2a3668cd3 (diff) |
V4L/DVB (7848): Fix dependencies for tuner-xc2028 and em28xx-dvb
em28xx-dvb doesn't need FW_LOADER. Instead, tuner-xc2028 needs to select
FW_LOADER.
Also, this can happen only if HOTPLUG is selected, since FW_LOADER
is dependent on HOTPLUG.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/common/tuners/Kconfig | 5 | ||||
-rw-r--r-- | drivers/media/video/em28xx/Kconfig | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/common/tuners/Kconfig b/drivers/media/common/tuners/Kconfig index ecbccc3cdc54..4fb77bc71394 100644 --- a/drivers/media/common/tuners/Kconfig +++ b/drivers/media/common/tuners/Kconfig | |||
@@ -21,7 +21,7 @@ config MEDIA_TUNER | |||
21 | tristate | 21 | tristate |
22 | default VIDEO_MEDIA && I2C | 22 | default VIDEO_MEDIA && I2C |
23 | depends on VIDEO_MEDIA && I2C | 23 | depends on VIDEO_MEDIA && I2C |
24 | select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE | 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 |
26 | select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMIZE | 26 | select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMIZE |
27 | select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE | 27 | select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE |
@@ -123,7 +123,8 @@ config MEDIA_TUNER_QT1010 | |||
123 | 123 | ||
124 | config MEDIA_TUNER_XC2028 | 124 | config MEDIA_TUNER_XC2028 |
125 | tristate "XCeive xc2028/xc3028 tuners" | 125 | tristate "XCeive xc2028/xc3028 tuners" |
126 | depends on FW_LOADER | 126 | depends on HOTPLUG |
127 | select FW_LOADER | ||
127 | default m if MEDIA_TUNER_CUSTOMIZE | 128 | default m if MEDIA_TUNER_CUSTOMIZE |
128 | help | 129 | help |
129 | Say Y here to include support for the xc2028/xc3028 tuners. | 130 | Say Y here to include support for the xc2028/xc3028 tuners. |
diff --git a/drivers/media/video/em28xx/Kconfig b/drivers/media/video/em28xx/Kconfig index 9caffed2b6b8..16a5af30e9d1 100644 --- a/drivers/media/video/em28xx/Kconfig +++ b/drivers/media/video/em28xx/Kconfig | |||
@@ -35,7 +35,6 @@ config VIDEO_EM28XX_DVB | |||
35 | select DVB_LGDT330X if !DVB_FE_CUSTOMISE | 35 | select DVB_LGDT330X if !DVB_FE_CUSTOMISE |
36 | select DVB_ZL10353 if !DVB_FE_CUSTOMISE | 36 | select DVB_ZL10353 if !DVB_FE_CUSTOMISE |
37 | select VIDEOBUF_DVB | 37 | select VIDEOBUF_DVB |
38 | select FW_LOADER | ||
39 | ---help--- | 38 | ---help--- |
40 | This adds support for DVB cards based on the | 39 | This adds support for DVB cards based on the |
41 | Empiatech em28xx chips. | 40 | Empiatech em28xx chips. |