diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2009-03-08 23:01:08 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-03-30 12:43:08 -0300 |
| commit | 5a771cb186dfa1f663ea15cdff3e32e04a8427e3 (patch) | |
| tree | 84f081cd48cef280ac4cce8bd86cc8e1d7691dbd /drivers/media/dvb/frontends | |
| parent | 632fe9fe440249642845675d97436c667cbbd21e (diff) | |
| download | talos-op-linux-5a771cb186dfa1f663ea15cdff3e32e04a8427e3.tar.gz talos-op-linux-5a771cb186dfa1f663ea15cdff3e32e04a8427e3.zip | |
V4L/DVB (10846): dvb/frontends: fix duplicate 'debug' symbol
Fix dvb frontend debug variable to be static, to avoid linker
errors:
drivers/built-in.o:(.data+0xf4b0): multiple definition of `debug'
arch/x86/kernel/built-in.o:(.kprobes.text+0x90): first defined here
ld: Warning: size of symbol `debug' changed from 85 in arch/x86/kernel/built-in.o to 4 in drivers/built-in.o
It would also be Good if arch/x86/kernel/entry_32.S didn't have a
non-static 'debug' symbol. OTOH, it helps catch things like this one.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/frontends')
| -rw-r--r-- | drivers/media/dvb/frontends/stv0900_core.c | 4 | ||||
| -rw-r--r-- | drivers/media/dvb/frontends/stv0900_priv.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/dvb/frontends/stv0900_core.c b/drivers/media/dvb/frontends/stv0900_core.c index ee20fbfc45f4..ca26518eafcd 100644 --- a/drivers/media/dvb/frontends/stv0900_core.c +++ b/drivers/media/dvb/frontends/stv0900_core.c @@ -34,8 +34,8 @@ #include "stv0900_priv.h" #include "stv0900_init.h" -int debug = 1; -module_param(debug, int, 0644); +static int stvdebug = 1; +module_param_named(debug, stvdebug, int, 0644); /* internal params node */ struct stv0900_inode { diff --git a/drivers/media/dvb/frontends/stv0900_priv.h b/drivers/media/dvb/frontends/stv0900_priv.h index 28350fbeb08d..762d5af62d7a 100644 --- a/drivers/media/dvb/frontends/stv0900_priv.h +++ b/drivers/media/dvb/frontends/stv0900_priv.h @@ -62,11 +62,11 @@ #define dmd_choose(a, b) (demod = STV0900_DEMOD_2 ? b : a)) -extern int debug; +static int stvdebug; #define dprintk(args...) \ do { \ - if (debug) \ + if (stvdebug) \ printk(KERN_DEBUG args); \ } while (0) |
