aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-12-28 10:47:47 -0500
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 10:34:16 -0500
commitc408a6f673e8fb0b67c81fc9cb29414265c1e6c1 (patch)
tree76c57c97ef97461f3fcf95c47bf09ec7a7299942 /drivers
parentc36c459a5530da8869a4de832188cdcb75b60359 (diff)
V4L/DVB (5017): DVB: fix compile error
This patch fixes the following compile error: <-- snip --> ... LD drivers/media/video/built-in.o drivers/media/video/saa7134/built-in.o:(.data+0x85ec): multiple definition of `ir_rc5_remote_gap' drivers/media/video/bt8xx/built-in.o:(.data+0x734c): first defined here drivers/media/video/saa7134/built-in.o:(.data+0x85f0): multiple definition of `ir_rc5_key_timeout' drivers/media/video/bt8xx/built-in.o:(.data+0x7350): first defined here make[4]: *** [drivers/media/video/built-in.o] Error 1 <-- snip --> Since this variables were needlessly global, this patch implements the trivial fix of making them static. Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/bt8xx/bttv-input.c4
-rw-r--r--drivers/media/video/saa7134/saa7134-input.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/video/bt8xx/bttv-input.c b/drivers/media/video/bt8xx/bttv-input.c
index 14c07c606632..825161b9cb3f 100644
--- a/drivers/media/video/bt8xx/bttv-input.c
+++ b/drivers/media/video/bt8xx/bttv-input.c
@@ -36,9 +36,9 @@ module_param(repeat_delay, int, 0644);
36static int repeat_period = 33; 36static int repeat_period = 33;
37module_param(repeat_period, int, 0644); 37module_param(repeat_period, int, 0644);
38 38
39int ir_rc5_remote_gap = 885; 39static int ir_rc5_remote_gap = 885;
40module_param(ir_rc5_remote_gap, int, 0644); 40module_param(ir_rc5_remote_gap, int, 0644);
41int ir_rc5_key_timeout = 200; 41static int ir_rc5_key_timeout = 200;
42module_param(ir_rc5_key_timeout, int, 0644); 42module_param(ir_rc5_key_timeout, int, 0644);
43 43
44#define DEVNAME "bttv-input" 44#define DEVNAME "bttv-input"
diff --git a/drivers/media/video/saa7134/saa7134-input.c b/drivers/media/video/saa7134/saa7134-input.c
index 1d0dd7e12521..46c583f1e788 100644
--- a/drivers/media/video/saa7134/saa7134-input.c
+++ b/drivers/media/video/saa7134/saa7134-input.c
@@ -40,9 +40,9 @@ static int pinnacle_remote = 0;
40module_param(pinnacle_remote, int, 0644); /* Choose Pinnacle PCTV remote */ 40module_param(pinnacle_remote, int, 0644); /* Choose Pinnacle PCTV remote */
41MODULE_PARM_DESC(pinnacle_remote, "Specify Pinnacle PCTV remote: 0=coloured, 1=grey (defaults to 0)"); 41MODULE_PARM_DESC(pinnacle_remote, "Specify Pinnacle PCTV remote: 0=coloured, 1=grey (defaults to 0)");
42 42
43int ir_rc5_remote_gap = 885; 43static int ir_rc5_remote_gap = 885;
44module_param(ir_rc5_remote_gap, int, 0644); 44module_param(ir_rc5_remote_gap, int, 0644);
45int ir_rc5_key_timeout = 115; 45static int ir_rc5_key_timeout = 115;
46module_param(ir_rc5_key_timeout, int, 0644); 46module_param(ir_rc5_key_timeout, int, 0644);
47 47
48#define dprintk(fmt, arg...) if (ir_debug) \ 48#define dprintk(fmt, arg...) if (ir_debug) \