summaryrefslogtreecommitdiff
path: root/linux/drivers/media/common
diff options
context:
space:
mode:
Diffstat (limited to 'linux/drivers/media/common')
-rw-r--r--linux/drivers/media/common/ir-common.c5
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;