From: Mauro Carvalho Chehab Date: Sun, 3 Jul 2011 21:59:08 +0000 (-0300) Subject: [media] ddbridge: Avoid duplicated symbol definition X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=805e68743460dd48971d5df2707eb445d980874c;p=mv-sheeva.git [media] ddbridge: Avoid duplicated symbol definition 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 --- diff --git a/drivers/media/dvb/ddbridge/ddbridge-core.c b/drivers/media/dvb/ddbridge/ddbridge-core.c index 81634f137bb..713fba442d4 100644 --- a/drivers/media/dvb/ddbridge/ddbridge-core.c +++ b/drivers/media/dvb/ddbridge/ddbridge-core.c @@ -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,