From: Michael Krufky Date: Mon, 9 Jan 2006 17:25:32 +0000 (-0200) Subject: V4L/DVB (3201): Remove #ifdef BTTV_BOARD_TWINHAN_VP3021 X-Git-Tag: v2.6.16-rc1~663^2~69 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fe66ba63fdd27cfc01ffb2e1835a2a475074a63;p=linux-2.6 V4L/DVB (3201): 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 Acked-by: Manu Abraham Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c index 9cac4e7959..01b4e0aac0 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c @@ -615,11 +615,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. @@ -823,11 +819,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;