The patch number 9977 was added via Mauro Carvalho Chehab <[email protected]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[email protected]
------
From: Mauro Carvalho Chehab <[email protected]>
Kbuild: fix compilation when dib7000p is not defined
dib7000p.h defines a few extern symbols when CONFIG_DVB_DIB7000P is not set.
since the
header is used on more than one driver, this causes symbol duplication, as
pointed by
Ingo Molnar <[email protected]>:
drivers/media/dvb/built-in.o: In function `dib7000p_set_gpio':
(.text+0x3f242): multiple definition of `dib7000p_set_gpio'
drivers/media/video/built-in.o:(.text+0xb8c1e): first defined here
drivers/media/dvb/built-in.o: In function `dib7000p_i2c_enumeration':
(.text+0x3f282): multiple definition of `dib7000p_i2c_enumeration'
drivers/media/video/built-in.o:(.text+0xb8c3e): first defined here
drivers/media/dvb/built-in.o: In function `dib7000p_set_wbd_ref':
(.text+0x3f1c1): multiple definition of `dib7000p_set_wbd_ref'
drivers/media/video/built-in.o:(.text+0xb8bfe): first defined here
LD drivers/net/built-in.o
make[2]: *** [drivers/media/built-in.o] Error 1
Priority: normal
CC: Patrick Boettcher <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
---
linux/drivers/media/dvb/frontends/dib7000p.h | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff -r 94592e006b95 -r cae6de452897
linux/drivers/media/dvb/frontends/dib7000p.h
--- a/linux/drivers/media/dvb/frontends/dib7000p.h Tue Dec 23 11:08:23
2008 -0200
+++ b/linux/drivers/media/dvb/frontends/dib7000p.h Fri Dec 26 08:07:39
2008 -0200
@@ -66,7 +66,8 @@ struct i2c_adapter *dib7000p_get_i2c_mas
return NULL;
}
-extern int dib7000p_i2c_enumeration(struct i2c_adapter *i2c,
+static inline
+int dib7000p_i2c_enumeration(struct i2c_adapter *i2c,
int no_of_demods, u8 default_addr,
struct dib7000p_config cfg[])
{
@@ -74,13 +75,15 @@ extern int dib7000p_i2c_enumeration(stru
return -ENODEV;
}
-extern int dib7000p_set_gpio(struct dvb_frontend *fe, u8 num, u8 dir, u8 val)
+static inline
+int dib7000p_set_gpio(struct dvb_frontend *fe, u8 num, u8 dir, u8 val)
{
printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
return -ENODEV;
}
-extern int dib7000p_set_wbd_ref(struct dvb_frontend *fe, u16 value)
+static inline
+int dib7000p_set_wbd_ref(struct dvb_frontend *fe, u16 value)
{
printk(KERN_WARNING "%s: driver disabled by Kconfig\n", __func__);
return -ENODEV;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/cae6de452897ca865a327d0670c6c5900a8c42d2
_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
