diff options
-rw-r--r-- | drivers/media/video/bt8xx/bttv-input.c | 4 | ||||
-rw-r--r-- | drivers/media/video/saa7134/saa7134-input.c | 4 | ||||
-rw-r--r-- | include/media/ir-common.h | 3 |
3 files changed, 4 insertions, 7 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); | |||
36 | static int repeat_period = 33; | 36 | static int repeat_period = 33; |
37 | module_param(repeat_period, int, 0644); | 37 | module_param(repeat_period, int, 0644); |
38 | 38 | ||
39 | int ir_rc5_remote_gap = 885; | 39 | static int ir_rc5_remote_gap = 885; |
40 | module_param(ir_rc5_remote_gap, int, 0644); | 40 | module_param(ir_rc5_remote_gap, int, 0644); |
41 | int ir_rc5_key_timeout = 200; | 41 | static int ir_rc5_key_timeout = 200; |
42 | module_param(ir_rc5_key_timeout, int, 0644); | 42 | module_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; | |||
40 | module_param(pinnacle_remote, int, 0644); /* Choose Pinnacle PCTV remote */ | 40 | module_param(pinnacle_remote, int, 0644); /* Choose Pinnacle PCTV remote */ |
41 | MODULE_PARM_DESC(pinnacle_remote, "Specify Pinnacle PCTV remote: 0=coloured, 1=grey (defaults to 0)"); | 41 | MODULE_PARM_DESC(pinnacle_remote, "Specify Pinnacle PCTV remote: 0=coloured, 1=grey (defaults to 0)"); |
42 | 42 | ||
43 | int ir_rc5_remote_gap = 885; | 43 | static int ir_rc5_remote_gap = 885; |
44 | module_param(ir_rc5_remote_gap, int, 0644); | 44 | module_param(ir_rc5_remote_gap, int, 0644); |
45 | int ir_rc5_key_timeout = 115; | 45 | static int ir_rc5_key_timeout = 115; |
46 | module_param(ir_rc5_key_timeout, int, 0644); | 46 | module_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) \ |
diff --git a/include/media/ir-common.h b/include/media/ir-common.h index 04201f77b85b..0a75c0fcfea2 100644 --- a/include/media/ir-common.h +++ b/include/media/ir-common.h | |||
@@ -36,9 +36,6 @@ | |||
36 | #define IR_KEYCODE(tab,code) (((unsigned)code < IR_KEYTAB_SIZE) \ | 36 | #define IR_KEYCODE(tab,code) (((unsigned)code < IR_KEYTAB_SIZE) \ |
37 | ? tab[code] : KEY_RESERVED) | 37 | ? tab[code] : KEY_RESERVED) |
38 | 38 | ||
39 | extern int ir_rc5_remote_gap; | ||
40 | extern int ir_rc5_key_timeout; | ||
41 | |||
42 | #define RC5_START(x) (((x)>>12)&3) | 39 | #define RC5_START(x) (((x)>>12)&3) |
43 | #define RC5_TOGGLE(x) (((x)>>11)&1) | 40 | #define RC5_TOGGLE(x) (((x)>>11)&1) |
44 | #define RC5_ADDR(x) (((x)>>6)&31) | 41 | #define RC5_ADDR(x) (((x)>>6)&31) |