Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux...

[mv-sheeva.git] / drivers / media / dvb / mantis / mantis_input.c

diff --git a/drivers/media/dvb/mantis/mantis_input.c b/drivers/media/dvb/mantis/mantis_input.c
index 3d4e4663220c21ac08ed31c98542851529be4f8f..a99489b8418b4e49890e1411020367571a63a325 100644 (file)
--- a/drivers/media/dvb/mantis/mantis_input.c
+++ b/drivers/media/dvb/mantis/mantis_input.c
@@ -19,7 +19,7 @@
 */
 
 #include <linux/input.h>
-#include <media/ir-common.h>
+#include <media/ir-core.h>
 #include <linux/pci.h>
 
 #include "dmxdev.h"
@@ -104,7 +104,6 @@ EXPORT_SYMBOL_GPL(ir_mantis);
 int mantis_input_init(struct mantis_pci *mantis)
 {
        struct input_dev *rc;
-       struct ir_input_state rc_state;
        char name[80], dev[80];
        int err;
 
@@ -120,8 +119,6 @@ int mantis_input_init(struct mantis_pci *mantis)
        rc->name = name;
        rc->phys = dev;
 
-       ir_input_init(rc, &rc_state, IR_TYPE_OTHER);
-
        rc->id.bustype  = BUS_PCI;
        rc->id.vendor   = mantis->vendor_id;
        rc->id.product  = mantis->device_id;