summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/bttv-cards.c
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-09-11 05:39:23 +0000
committerMichael Krufky <devnull@localhost>2005-09-11 05:39:23 +0000
commitdc02e7f0890fa0aa26b84c367e2f1d15a400f7df (patch)
tree15b0fbdfea3072dfa0f91c7733f44476bd016b9b /linux/drivers/media/video/bttv-cards.c
parent9d9d36201e1639157c09fb12c0b22e0b749da2a0 (diff)
downloadmediapointer-dvb-s2-dc02e7f0890fa0aa26b84c367e2f1d15a400f7df.tar.gz
mediapointer-dvb-s2-dc02e7f0890fa0aa26b84c367e2f1d15a400f7df.tar.bz2
* bttv-cards.c:
- duplicate initializer (near initialization for `bttv_tvcards[9].tuner_addr') duplicate initializer (near initialization for `bttv_tvcards[11].tuner_addr') * cx88-input.c, tuner.h, tvaudio.c, tveeprom.c: - Work around gcc-2.95.x macro expansion bug Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Michael Krufky <mkrufky@m1k.net>
Diffstat (limited to 'linux/drivers/media/video/bttv-cards.c')
-rw-r--r--linux/drivers/media/video/bttv-cards.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/linux/drivers/media/video/bttv-cards.c b/linux/drivers/media/video/bttv-cards.c
index 696f9f125..72bc3535d 100644
--- a/linux/drivers/media/video/bttv-cards.c
+++ b/linux/drivers/media/video/bttv-cards.c
@@ -1,5 +1,5 @@
/*
- $Id: bttv-cards.c,v 1.74 2005/09/10 07:33:02 mkrufky Exp $
+ $Id: bttv-cards.c,v 1.75 2005/09/11 05:39:23 mkrufky Exp $
bttv-cards.c
@@ -445,7 +445,6 @@ struct tvcard bttv_tvcards[] = {
.video_inputs = 3,
.audio_inputs = 1,
.tuner = 0,
- .tuner_addr = ADDR_UNSET,
.svhs = 2,
.gpiomask = 3,
.muxsel = { 2, 3, 1, 1},
@@ -472,7 +471,6 @@ struct tvcard bttv_tvcards[] = {
.video_inputs = 3,
.audio_inputs = 1,
.tuner = 0,
- .tuner_addr = ADDR_UNSET,
.svhs = 2,
.gpiomask = 0x3014f,
.muxsel = { 2, 3, 1, 1},