diff options
| -rw-r--r-- | linux/drivers/media/common/ir-keymaps.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx88/cx88-cards.c | 8 | ||||
| -rw-r--r-- | v4l/compat.h | 7 |
3 files changed, 9 insertions, 7 deletions
diff --git a/linux/drivers/media/common/ir-keymaps.c b/linux/drivers/media/common/ir-keymaps.c index ad9eea005..075d5e746 100644 --- a/linux/drivers/media/common/ir-keymaps.c +++ b/linux/drivers/media/common/ir-keymaps.c @@ -24,6 +24,7 @@ #include <linux/input.h> #include <media/ir-common.h> +#include "compat.h" /* empty keytable, can be used as placeholder for not-yet created keytables */ IR_KEYTAB_TYPE ir_codes_empty[IR_KEYTAB_SIZE] = { diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index 06dd9f282..e09b3c37e 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -1051,11 +1051,7 @@ struct cx88_board cx88_boards[] = { .dvb = 1, }, [CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT] = { - /* FIXME: Standard video using the cx88 broadcast decoder is - * working, but blackbird isn't working yet, audio is only - * working correctly for television mode. S-Video and Composite - * are working for video-only, so I have them disabled for now. - */ + /* FIXME: Audio not working for s-video / composite inputs. */ .name = "KWorld HardwareMpegTV XPert", .tuner_type = TUNER_PHILIPS_TDA8290, .radio_type = UNSET, @@ -1066,7 +1062,6 @@ struct cx88_board cx88_boards[] = { .vmux = 0, .gpio0 = 0x3de2, .gpio2 = 0x00ff, -#if 0 },{ .type = CX88_VMUX_COMPOSITE1, .vmux = 1, @@ -1075,7 +1070,6 @@ struct cx88_board cx88_boards[] = { .type = CX88_VMUX_SVIDEO, .vmux = 2, .gpio0 = 0x3de6, -#endif }}, .radio = { .type = CX88_RADIO, diff --git a/v4l/compat.h b/v4l/compat.h index b9138c7be..ca0a4b886 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -178,6 +178,13 @@ static inline unsigned long msleep_interruptible(unsigned int msecs) # define KEY_OK 0x160 # define KEY_DIGITS 0x19d #endif +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,14) +# define KEY_SEND 231 +# define KEY_REPLY 232 +# define KEY_FORWARDMAIL 233 +# define KEY_SAVE 234 +# define KEY_DOCUMENTS 235 +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) #define container_of(ptr, type, member) ({ \ |