]> err.no Git - linux-2.6/commit
V4L/DVB (5017): DVB: fix compile error
authorAdrian Bunk <bunk@stusta.de>
Thu, 28 Dec 2006 15:47:47 +0000 (12:47 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 21 Feb 2007 15:34:16 +0000 (13:34 -0200)
commitc408a6f673e8fb0b67c81fc9cb29414265c1e6c1
tree76c57c97ef97461f3fcf95c47bf09ec7a7299942
parentc36c459a5530da8869a4de832188cdcb75b60359
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>
drivers/media/video/bt8xx/bttv-input.c
drivers/media/video/saa7134/saa7134-input.c
include/media/ir-common.h