diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-28 13:10:41 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-28 13:10:41 -0300 |
| commit | 7f0a5ef53fcd9c111e1f790d953c4f94ad9b181c (patch) | |
| tree | 5e9e367ef9b0edf36dcca6d6dcb0d67a5f3bea6e /linux/drivers/media/common/tuners | |
| parent | b56bf8a6147de81da31ee2fde96fe8367386383c (diff) | |
| parent | c0f201cc9dd7be8c8951ecf09e97b783ff10b9b2 (diff) | |
| download | mediapointer-dvb-s2-7f0a5ef53fcd9c111e1f790d953c4f94ad9b181c.tar.gz mediapointer-dvb-s2-7f0a5ef53fcd9c111e1f790d953c4f94ad9b181c.tar.bz2 | |
merge: http://linuxtv.org/hg/~mkrufky/woodbury
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/common/tuners')
| -rw-r--r-- | linux/drivers/media/common/tuners/Kconfig | 9 | ||||
| -rw-r--r-- | linux/drivers/media/common/tuners/mxl5007t.h | 1 |
2 files changed, 2 insertions, 8 deletions
diff --git a/linux/drivers/media/common/tuners/Kconfig b/linux/drivers/media/common/tuners/Kconfig index 8d93ba857..6f92beaa5 100644 --- a/linux/drivers/media/common/tuners/Kconfig +++ b/linux/drivers/media/common/tuners/Kconfig @@ -21,9 +21,8 @@ config MEDIA_TUNER tristate default VIDEO_MEDIA && I2C depends on VIDEO_MEDIA && I2C - select FW_LOADER if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG - select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG - select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE && HOTPLUG + select MEDIA_TUNER_XC2028 if !MEDIA_TUNER_CUSTOMIZE + select MEDIA_TUNER_XC5000 if !MEDIA_TUNER_CUSTOMIZE select MEDIA_TUNER_MT20XX if !MEDIA_TUNER_CUSTOMIZE select MEDIA_TUNER_TDA8290 if !MEDIA_TUNER_CUSTOMIZE select MEDIA_TUNER_TEA5761 if !MEDIA_TUNER_CUSTOMIZE @@ -138,8 +137,6 @@ config MEDIA_TUNER_QT1010 config MEDIA_TUNER_XC2028 tristate "XCeive xc2028/xc3028 tuners" depends on VIDEO_MEDIA && I2C - depends on HOTPLUG - select FW_LOADER default m if MEDIA_TUNER_CUSTOMIZE help Say Y here to include support for the xc2028/xc3028 tuners. @@ -147,8 +144,6 @@ config MEDIA_TUNER_XC2028 config MEDIA_TUNER_XC5000 tristate "Xceive XC5000 silicon tuner" depends on VIDEO_MEDIA && I2C - depends on HOTPLUG - select FW_LOADER default m if DVB_FE_CUSTOMISE help A driver for the silicon tuner XC5000 from Xceive. diff --git a/linux/drivers/media/common/tuners/mxl5007t.h b/linux/drivers/media/common/tuners/mxl5007t.h index a1ee3628b..aa3eea0b5 100644 --- a/linux/drivers/media/common/tuners/mxl5007t.h +++ b/linux/drivers/media/common/tuners/mxl5007t.h @@ -77,7 +77,6 @@ struct mxl5007t_config { unsigned int clk_out_enable:1; }; -#define CONFIG_MEDIA_TUNER_MXL5007T #if defined(CONFIG_MEDIA_TUNER_MXL5007T) || (defined(CONFIG_MEDIA_TUNER_MXL5007T_MODULE) && defined(MODULE)) extern struct dvb_frontend *mxl5007t_attach(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 addr, |