diff options
| -rw-r--r-- | linux/drivers/media/video/ir-kbd-gpio.c | 5 | ||||
| -rw-r--r-- | v4l/ChangeLog | 7 | ||||
| -rw-r--r-- | v4l/compat.h | 6 |
3 files changed, 7 insertions, 11 deletions
diff --git a/linux/drivers/media/video/ir-kbd-gpio.c b/linux/drivers/media/video/ir-kbd-gpio.c index 80d21c553..dbd21ce7c 100644 --- a/linux/drivers/media/video/ir-kbd-gpio.c +++ b/linux/drivers/media/video/ir-kbd-gpio.c @@ -1,5 +1,5 @@ /* - * $Id: ir-kbd-gpio.c,v 1.17 2005/09/08 19:19:21 nsh Exp $ + * $Id: ir-kbd-gpio.c,v 1.18 2005/09/08 22:19:56 nsh Exp $ * * Copyright (c) 2003 Gerd Knorr * Copyright (c) 2003 Pavel Machek @@ -30,7 +30,6 @@ #include <media/ir-common.h> #include "bttv.h" -#include "compat.h" /* ---------------------------------------------------------------------- */ @@ -164,7 +163,7 @@ static IR_KEYTAB_TYPE ir_codes_apac_viewcomp[IR_KEYTAB_SIZE] = { static IR_KEYTAB_TYPE ir_codes_conceptronic[IR_KEYTAB_SIZE] = { [ 30 ] = KEY_POWER, // power - [ 7 ] = KEY_SWITCHVIDEOMODE, // source + [ 7 ] = KEY_MEDIA, // source [ 28 ] = KEY_SEARCH, // scan /* FIXME: duplicate keycodes? diff --git a/v4l/ChangeLog b/v4l/ChangeLog index b47d8fc85..233b08a48 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,7 +1,8 @@ -2005-09-08 19:06 nshmyrev +2005-09-08 23:06 nshmyrev - * compat.h, i2c-kbd-gpio.c: - - Define missing key value, fix compilation with older kernels + * i2c-kbd-gpio.c: + - Use KEY_MEDIA instead of KEY_VIDEOMODESWITCH since + it fix build with older kernels. Signed-off-by: Nickolay V. Shmyrev <nshmyrev@yandex.ru> Signed-off-by: James Schettine <james@NOSPAM.MyVnc.com> diff --git a/v4l/compat.h b/v4l/compat.h index f86330c89..6e743935e 100644 --- a/v4l/compat.h +++ b/v4l/compat.h @@ -1,5 +1,5 @@ /* - * $Id: compat.h,v 1.16 2005/09/08 19:19:21 nsh Exp $ + * $Id: compat.h,v 1.17 2005/09/08 22:19:56 nsh Exp $ */ #ifndef _COMPAT_H @@ -109,10 +109,6 @@ static inline unsigned long msleep_interruptible(unsigned int msecs) #define pm_message_t u32 #endif -#ifndef KEY_SWITCHVIDEOMODE -#define KEY_SWITCHVIDEOMODE KEY_MEDIA -#endif - #endif /* * Local variables: |