[PATCH 1/8] ir-core: convert mantis to not use ir-functions.c

[David Härdeman]

Convert drivers/media/dvb/mantis/mantis_input.c to not use ir-functions.c

Signed-off-by: David Härdeman <da...@hardeman.nu>
---
 drivers/media/dvb/mantis/mantis_input.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/drivers/media/dvb/mantis/mantis_input.c 
b/drivers/media/dvb/mantis/mantis_input.c
index 3d4e466..a99489b 100644
--- 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;

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html