summaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2006-12-28 12:47:47 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2007-02-21 13:34:16 -0200
commitc408a6f673e8fb0b67c81fc9cb29414265c1e6c1 (patch)
tree76c57c97ef97461f3fcf95c47bf09ec7a7299942 /include/media
parentc36c459a5530da8869a4de832188cdcb75b60359 (diff)
downloadop-kernel-dev-c408a6f673e8fb0b67c81fc9cb29414265c1e6c1.zip
op-kernel-dev-c408a6f673e8fb0b67c81fc9cb29414265c1e6c1.tar.gz
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 'include/media')
-rw-r--r--include/media/ir-common.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/media/ir-common.h b/include/media/ir-common.h
index 04201f7..0a75c0f 100644
--- a/include/media/ir-common.h
+++ b/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)
OpenPOWER on IntegriCloud