aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRandy Dunlap <randy.dunlap@oracle.com>2009-03-08 23:01:08 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-03-30 12:43:08 -0300
commit5a771cb186dfa1f663ea15cdff3e32e04a8427e3 (patch)
tree84f081cd48cef280ac4cce8bd86cc8e1d7691dbd
parent632fe9fe440249642845675d97436c667cbbd21e (diff)
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>
-rw-r--r--drivers/media/dvb/frontends/stv0900_core.c4
-rw-r--r--drivers/media/dvb/frontends/stv0900_priv.h4
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 ee20fbfc45f..ca26518eafc 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 28350fbeb08..762d5af62d7 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)