diff options
author | David Härdeman <david@hardeman.nu> | 2010-06-07 15:32:18 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-08-02 13:53:07 -0400 |
commit | f0bdee26a2dc904c463bae1c2ae9ad06f97f100d (patch) | |
tree | 8cbc674d16a4596e404fe4364eee056935c21cb2 /drivers/media/dvb/mantis/mantis_input.c | |
parent | bee30192feeba6d69db45434e7818d532d1b8d33 (diff) |
V4L/DVB: ir-core: convert mantis to not use ir-functions.c
Convert drivers/media/dvb/mantis/mantis_input.c to not use ir-functions.c
Signed-off-by: David Härdeman <david@hardeman.nu>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/mantis/mantis_input.c')
-rw-r--r-- | 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 3d4e4663220c..a99489b8418b 100644 --- a/drivers/media/dvb/mantis/mantis_input.c +++ b/drivers/media/dvb/mantis/mantis_input.c | |||
@@ -19,7 +19,7 @@ | |||
19 | */ | 19 | */ |
20 | 20 | ||
21 | #include <linux/input.h> | 21 | #include <linux/input.h> |
22 | #include <media/ir-common.h> | 22 | #include <media/ir-core.h> |
23 | #include <linux/pci.h> | 23 | #include <linux/pci.h> |
24 | 24 | ||
25 | #include "dmxdev.h" | 25 | #include "dmxdev.h" |
@@ -104,7 +104,6 @@ EXPORT_SYMBOL_GPL(ir_mantis); | |||
104 | int mantis_input_init(struct mantis_pci *mantis) | 104 | int mantis_input_init(struct mantis_pci *mantis) |
105 | { | 105 | { |
106 | struct input_dev *rc; | 106 | struct input_dev *rc; |
107 | struct ir_input_state rc_state; | ||
108 | char name[80], dev[80]; | 107 | char name[80], dev[80]; |
109 | int err; | 108 | int err; |
110 | 109 | ||
@@ -120,8 +119,6 @@ int mantis_input_init(struct mantis_pci *mantis) | |||
120 | rc->name = name; | 119 | rc->name = name; |
121 | rc->phys = dev; | 120 | rc->phys = dev; |
122 | 121 | ||
123 | ir_input_init(rc, &rc_state, IR_TYPE_OTHER); | ||
124 | |||
125 | rc->id.bustype = BUS_PCI; | 122 | rc->id.bustype = BUS_PCI; |
126 | rc->id.vendor = mantis->vendor_id; | 123 | rc->id.vendor = mantis->vendor_id; |
127 | rc->id.product = mantis->device_id; | 124 | rc->id.product = mantis->device_id; |