diff options
| author | Ricardo Cerqueira <devnull@localhost> | 2005-12-04 01:12:43 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <devnull@localhost> | 2005-12-04 01:12:43 +0000 |
| commit | ca739c0f5e983380bc1021dac8c309c0729ce0f5 (patch) | |
| tree | 25f3f73acb5754a158406815bf8a82f86d43f10c /linux/drivers/media/common | |
| parent | 25ef5b3135b8a5dd7f9faa8c2709f8e7bddf6cfc (diff) | |
| download | mediapointer-dvb-s2-ca739c0f5e983380bc1021dac8c309c0729ce0f5.tar.gz mediapointer-dvb-s2-ca739c0f5e983380bc1021dac8c309c0729ce0f5.tar.bz2 | |
Backport of Dmitry Torokhov's input layer changes at mainline kernel
From: Ricardo Cerqueira <v4l@cerqueira.org>
kernel-sync
Ported changes by Dmitry Torokhov <dtor_core@ameritech.net> and added
backwards compatibility checks for kernels < 2.6.15
Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Diffstat (limited to 'linux/drivers/media/common')
| -rw-r--r-- | linux/drivers/media/common/ir-common.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/linux/drivers/media/common/ir-common.c b/linux/drivers/media/common/ir-common.c index d45221e8e..0f5ac7ff5 100644 --- a/linux/drivers/media/common/ir-common.c +++ b/linux/drivers/media/common/ir-common.c @@ -1,5 +1,5 @@ /* - * $Id: ir-common.c,v 1.17 2005/11/28 00:07:40 mkrufky Exp $ + * $Id: ir-common.c,v 1.18 2005/12/04 01:12:43 rmcc Exp $ * * some common structs and functions to handle infrared remotes via * input layer ... @@ -369,7 +369,10 @@ void ir_input_init(struct input_dev *dev, struct ir_input_state *ir, if (ir_codes) memcpy(ir->ir_codes, ir_codes, sizeof(ir->ir_codes)); +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15) init_input_dev(dev); +#endif + dev->keycode = ir->ir_codes; dev->keycodesize = sizeof(IR_KEYTAB_TYPE); dev->keycodemax = IR_KEYTAB_SIZE; |