diff options
| author | Michael Krufky <mkrufky@linuxtv.org> | 2007-10-24 08:06:47 -0400 |
|---|---|---|
| committer | Michael Krufky <mkrufky@linuxtv.org> | 2007-10-24 08:06:47 -0400 |
| commit | 803132a3c8c06956bc3fc589693fb390dcf23368 (patch) | |
| tree | 4c200d158552e486d3e920ce3fb09290f92dfa43 /linux/drivers/media/video/tuner-core.c | |
| parent | 3bca88b5f0fc7fcf0e988206f23a790ae73555ad (diff) | |
| download | mediapointer-dvb-s2-803132a3c8c06956bc3fc589693fb390dcf23368.tar.gz mediapointer-dvb-s2-803132a3c8c06956bc3fc589693fb390dcf23368.tar.bz2 | |
tuner: fix CONFIG_TUNER_TEA5761=m
From: Adrian Bunk <bunk@kernel.org>
This patch fixes CONFIG_TUNER_TEA5761=m broken by
commit ca805d57cf5ea7482ed3da28653f30621249ee45.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
---
linux/drivers/media/video/tuner-core.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
Diffstat (limited to 'linux/drivers/media/video/tuner-core.c')
| -rw-r--r-- | linux/drivers/media/video/tuner-core.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/linux/drivers/media/video/tuner-core.c b/linux/drivers/media/video/tuner-core.c index 3c8ffe423..4d1c2c7a2 100644 --- a/linux/drivers/media/video/tuner-core.c +++ b/linux/drivers/media/video/tuner-core.c @@ -35,7 +35,7 @@ /* standard i2c insmod options */ static unsigned short normal_i2c[] = { -#ifdef CONFIG_TUNER_TEA5761 +#if defined(CONFIG_TUNER_TEA5761) || (defined(CONFIG_TUNER_TEA5761_MODULE) && defined(MODULE)) 0x10, #endif 0x42, 0x43, 0x4a, 0x4b, /* tda8290 */ @@ -322,7 +322,6 @@ static void set_type(struct i2c_client *c, unsigned int type, } t->mode_mask = T_RADIO; break; -#ifdef CONFIG_TUNER_TEA5761 case TUNER_TEA5761: if (tea5761_attach(&t->fe, t->i2c.adapter, t->i2c.addr) == NULL) { t->type = TUNER_ABSENT; @@ -331,7 +330,6 @@ static void set_type(struct i2c_client *c, unsigned int type, } t->mode_mask = T_RADIO; break; -#endif case TUNER_PHILIPS_FMD1216ME_MK3: buffer[0] = 0x0b; buffer[1] = 0xdc; @@ -650,7 +648,6 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, /* autodetection code based on the i2c addr */ if (!no_autodetect) { switch (addr) { -#ifdef CONFIG_TUNER_TEA5761 case 0x10: if (tea5761_autodetection(t->i2c.adapter, t->i2c.addr) != EINVAL) { t->type = TUNER_TEA5761; @@ -662,7 +659,6 @@ static int tuner_attach(struct i2c_adapter *adap, int addr, goto register_client; } break; -#endif case 0x42: case 0x43: case 0x4a: |