diff options
author | Ricardo Cerqueira <v4l@cerqueira.org> | 2006-01-09 12:25:25 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 12:25:25 -0500 |
commit | 4abdfed5676e5ef7f2461bb76f5929068a9cc9cf (patch) | |
tree | ff4e3e80f57f788a9cf450966f137c44b58ff1b2 /drivers/media/video/bttv-cards.c | |
parent | e0b2d7a89bb250fb0c9068c4481c9fd26c3fb227 (diff) |
V4L/DVB (3161): ir-kbd-gpio is now part of bttv
- Merged ir-kbd-gpio into bttv as bttv-input, for consistency with other
input modules
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/video/bttv-cards.c')
-rw-r--r-- | drivers/media/video/bttv-cards.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c index c94092351b79..440f635e020f 100644 --- a/drivers/media/video/bttv-cards.c +++ b/drivers/media/video/bttv-cards.c | |||
@@ -2139,7 +2139,6 @@ struct tvcard bttv_tvcards[] = { | |||
2139 | .has_remote = 1, | 2139 | .has_remote = 1, |
2140 | .gpiomask = 0x1b, | 2140 | .gpiomask = 0x1b, |
2141 | .no_gpioirq = 1, | 2141 | .no_gpioirq = 1, |
2142 | .any_irq = 1, | ||
2143 | }, | 2142 | }, |
2144 | [BTTV_BOARD_PV143] = { | 2143 | [BTTV_BOARD_PV143] = { |
2145 | /* Jorge Boncompte - DTI2 <jorge@dti2.net> */ | 2144 | /* Jorge Boncompte - DTI2 <jorge@dti2.net> */ |
@@ -3412,8 +3411,6 @@ void __devinit bttv_init_card2(struct bttv *btv) | |||
3412 | btv->has_remote=1; | 3411 | btv->has_remote=1; |
3413 | if (!bttv_tvcards[btv->c.type].no_gpioirq) | 3412 | if (!bttv_tvcards[btv->c.type].no_gpioirq) |
3414 | btv->gpioirq=1; | 3413 | btv->gpioirq=1; |
3415 | if (bttv_tvcards[btv->c.type].any_irq) | ||
3416 | btv->any_irq = 1; | ||
3417 | if (bttv_tvcards[btv->c.type].audio_hook) | 3414 | if (bttv_tvcards[btv->c.type].audio_hook) |
3418 | btv->audio_hook=bttv_tvcards[btv->c.type].audio_hook; | 3415 | btv->audio_hook=bttv_tvcards[btv->c.type].audio_hook; |
3419 | 3416 | ||