diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-28 13:47:47 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-28 13:47:47 -0200 |
| commit | 7bc691450b6934b38f04971d56553f5264bb08bd (patch) | |
| tree | d038b354d5031aa40ec56eb297a1fa0b7f7e91e3 /linux/include/media/ir-common.h | |
| parent | 3a6b5dfd2270a9ddcdf2b81e4dfa9388a343b0cd (diff) | |
| download | mediapointer-dvb-s2-7bc691450b6934b38f04971d56553f5264bb08bd.tar.gz mediapointer-dvb-s2-7bc691450b6934b38f04971d56553f5264bb08bd.tar.bz2 | |
DVB: fix compile error
From: Adrian Bunk <bunk@stusta.de>
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 'linux/include/media/ir-common.h')
| -rw-r--r-- | linux/include/media/ir-common.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/linux/include/media/ir-common.h b/linux/include/media/ir-common.h index 04201f77b..0a75c0fcf 100644 --- a/linux/include/media/ir-common.h +++ b/linux/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) |