diff options
| -rw-r--r-- | linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c | 8 | ||||
| -rw-r--r-- | v4l/ChangeLog | 15 |
2 files changed, 15 insertions, 8 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c index 42c82efed..5190ecb20 100644 --- a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c @@ -616,11 +616,7 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) dprintk ("dvb_bt8xx: lgdt330x detected\n"); break; -#ifdef BTTV_BOARD_TWINHAN_VP3021 - case BTTV_BOARD_TWINHAN_VP3021: -#else case BTTV_BOARD_NEBULA_DIGITV: -#endif /* * It is possible to determine the correct frontend using the I2C bus (see the Nebula SDK); * this would be a cleaner solution than trying each frontend in turn. @@ -824,11 +820,7 @@ static int dvb_bt8xx_probe(struct device *dev) card->irq_err_ignore = BT878_AFBUS | BT878_AFDSR; break; -#ifdef BTTV_BOARD_TWINHAN_VP3021 - case BTTV_BOARD_TWINHAN_VP3021: -#else case BTTV_BOARD_NEBULA_DIGITV: -#endif case BTTV_BOARD_AVDVBT_761: card->gpio_mode = (1 << 26) | (1 << 14) | (1 << 5); card->op_sync_orin = 0; diff --git a/v4l/ChangeLog b/v4l/ChangeLog index fb2559e8a..7ea27b8b8 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,18 @@ +2005-12-20 17:23 mkrufky + + * linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c: + (frontend_init), (dvb_bt8xx_probe): + - Remove #ifdef BTTV_BOARD_TWINHAN_VP3021 + + As far back as the video4linux cvs repository goes, there is no + mention of BTTV_TWINHAN_VP3021. It seems that this was done for + the sake of backwards compatability with some older v4l, but + this can no longer be necessary due to the v4l/dvb cvs merger, + nor should this have ever existed in the upstream kernel. + + Signed-off-by: Michael Krufky <mkrufky@m1k.net> + Acked-by: Manu Abraham <manu@linuxtv.org> + 2005-12-20 17:05 rmcc * linux/drivers/media/video/saa7134/saa7134-alsa.c: |