]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
[media] ddbridge: Avoid duplicated symbol definition
authorMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 3 Jul 2011 21:59:08 +0000 (18:59 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Sun, 10 Jul 2011 19:38:22 +0000 (16:38 -0300)
drivers/media/dvb/ddbridge/built-in.o: In function `my_dvb_dmx_ts_card_init':
/home/v4l/v4l/patchwork/drivers/media/dvb/ddbridge/ddbridge-core.c:718: multiple definition of `my_dvb_dmx_ts_card_init'
drivers/media/dvb/ngene/built-in.o:/home/v4l/v4l/patchwork/drivers/media/dvb/ngene/ngene-dvb.c:227: first defined here
drivers/media/dvb/ddbridge/built-in.o: In function `my_dvb_dmxdev_ts_card_init':
/home/v4l/v4l/patchwork/drivers/media/dvb/ddbridge/ddbridge-core.c:737: multiple definition of `my_dvb_dmxdev_ts_card_init'
drivers/media/dvb/ngene/built-in.o:/home/v4l/v4l/patchwork/drivers/media/dvb/ngene/ngene-dvb.c:246: first defined here

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/dvb/ddbridge/ddbridge-core.c

index 81634f137bb3ff246141e365a0b1af7b4b74ff34..713fba442d4a438f4b10039650f459be3c6ab1cf 100644 (file)
@@ -711,7 +711,7 @@ static int tuner_attach_stv6110(struct ddb_input *input, int type)
        return 0;
 }
 
-int my_dvb_dmx_ts_card_init(struct dvb_demux *dvbdemux, char *id,
+static int my_dvb_dmx_ts_card_init(struct dvb_demux *dvbdemux, char *id,
                            int (*start_feed)(struct dvb_demux_feed *),
                            int (*stop_feed)(struct dvb_demux_feed *),
                            void *priv)
@@ -729,7 +729,7 @@ int my_dvb_dmx_ts_card_init(struct dvb_demux *dvbdemux, char *id,
        return dvb_dmx_init(dvbdemux);
 }
 
-int my_dvb_dmxdev_ts_card_init(struct dmxdev *dmxdev,
+static int my_dvb_dmxdev_ts_card_init(struct dmxdev *dmxdev,
                               struct dvb_demux *dvbdemux,
                               struct dmx_frontend *hw_frontend,
                               struct dmx_frontend *mem_frontend,