iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V4L/DVB (5017): DVB: fix compile error

Browse Source 
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>
This commit is contained in:
Adrian Bunk 2006-12-28 12:47:47 -03:00 committed by Mauro Carvalho Chehab
parent c36c459a55
commit c408a6f673
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/video/bt8xx/bttv-input.c
View File

@ -36,9 +36,9 @@ module_param(repeat_delay, int, 0644);
static int repeat_period = 33; static int repeat_period = 33;
module_param(repeat_period, int, 0644); module_param(repeat_period, int, 0644);
int ir_rc5_remote_gap = 885; static int ir_rc5_remote_gap = 885;
module_param(ir_rc5_remote_gap, int, 0644); module_param(ir_rc5_remote_gap, int, 0644);
int ir_rc5_key_timeout = 200; static int ir_rc5_key_timeout = 200;
module_param(ir_rc5_key_timeout, int, 0644); module_param(ir_rc5_key_timeout, int, 0644);
#define DEVNAME "bttv-input" #define DEVNAME "bttv-input"

4
drivers/media/video/saa7134/saa7134-input.c
View File

@ -40,9 +40,9 @@ static int pinnacle_remote = 0;
module_param(pinnacle_remote, int, 0644); /* Choose Pinnacle PCTV remote */ module_param(pinnacle_remote, int, 0644); /* Choose Pinnacle PCTV remote */
MODULE_PARM_DESC(pinnacle_remote, "Specify Pinnacle PCTV remote: 0=coloured, 1=grey (defaults to 0)"); MODULE_PARM_DESC(pinnacle_remote, "Specify Pinnacle PCTV remote: 0=coloured, 1=grey (defaults to 0)");
int ir_rc5_remote_gap = 885; static int ir_rc5_remote_gap = 885;
module_param(ir_rc5_remote_gap, int, 0644); module_param(ir_rc5_remote_gap, int, 0644);
int ir_rc5_key_timeout = 115; static int ir_rc5_key_timeout = 115;
module_param(ir_rc5_key_timeout, int, 0644); module_param(ir_rc5_key_timeout, int, 0644);
#define dprintk(fmt, arg...) if (ir_debug) \ #define dprintk(fmt, arg...) if (ir_debug) \

3
include/media/ir-common.h
View File

@ -36,9 +36,6 @@
#define IR_KEYCODE(tab,code) (((unsigned)code < IR_KEYTAB_SIZE) \ #define IR_KEYCODE(tab,code) (((unsigned)code < IR_KEYTAB_SIZE) \
? tab[code] : KEY_RESERVED) ? tab[code] : KEY_RESERVED)
extern int ir_rc5_remote_gap;
extern int ir_rc5_key_timeout;
#define RC5_START(x) (((x)>>12)&3) #define RC5_START(x) (((x)>>12)&3)
#define RC5_TOGGLE(x) (((x)>>11)&1) #define RC5_TOGGLE(x) (((x)>>11)&1)
#define RC5_ADDR(x) (((x)>>6)&31) #define RC5_ADDR(x) (((x)>>6)&31)