[PATCH -mm] compile error in drivers/media/video

[Daniel Walker <dwalker@mvista.com>]

  LD      drivers/media/video/built-in.o
drivers/media/video/saa7134/built-in.o:(.data+0x86ac): multiple definition of `ir_rc5_remote_gap'
drivers/media/video/bt8xx/built-in.o:(.data+0x71b4): first defined here
drivers/media/video/saa7134/built-in.o:(.data+0x86b0): multiple definition of `ir_rc5_key_timeout'
drivers/media/video/bt8xx/built-in.o:(.data+0x71b8): first defined here
make[2]: *** [drivers/media/video/built-in.o] Error 1
make[1]: *** [drivers/media/video] Error 2
make: *** [drivers/media/] Error 2

Looks like something was unfinished here. I just made the two variables
static.


Signed-Off-By: Daniel Walker <dwalker@mvista.com>

---
 drivers/media/video/bt8xx/bttv-input.c      |    4 ++--
 drivers/media/video/saa7134/saa7134-input.c |    4 ++--
 include/media/ir-common.h                   |    3 ---
 3 files changed, 4 insertions(+), 7 deletions(-)

Index: linux-2.6.19/drivers/media/video/bt8xx/bttv-input.c
===================================================================
--- linux-2.6.19.orig/drivers/media/video/bt8xx/bttv-input.c
+++ linux-2.6.19/drivers/media/video/bt8xx/bttv-input.c
@@ -36,9 +36,9 @@ module_param(repeat_delay, int, 0644);
 static int repeat_period = 33;
 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);
-int ir_rc5_key_timeout = 200;
+static int ir_rc5_key_timeout = 200;
 module_param(ir_rc5_key_timeout, int, 0644);
 
 #define DEVNAME "bttv-input"
Index: linux-2.6.19/drivers/media/video/saa7134/saa7134-input.c
===================================================================
--- linux-2.6.19.orig/drivers/media/video/saa7134/saa7134-input.c
+++ linux-2.6.19/drivers/media/video/saa7134/saa7134-input.c
@@ -41,9 +41,9 @@ static int pinnacle_remote = 0;
 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)");
 
-int ir_rc5_remote_gap = 885;
+static int ir_rc5_remote_gap = 885;
 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);
 
 #define dprintk(fmt, arg...)	if (ir_debug) \
Index: linux-2.6.19/include/media/ir-common.h
===================================================================
--- linux-2.6.19.orig/include/media/ir-common.h
+++ linux-2.6.19/include/media/ir-common.h
@@ -36,9 +36,6 @@
 #define IR_KEYCODE(tab,code)	(((unsigned)code < IR_KEYTAB_SIZE) \
 				 ? 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_TOGGLE(x)	(((x)>>11)&1)
 #define RC5_ADDR(x)	(((x)>>6)&31)
--
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/