diff options
Diffstat (limited to 'drivers/media/dvb/mantis')
-rw-r--r-- | drivers/media/dvb/mantis/mantis_hif.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/mantis/mantis_input.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/mantis/mantis_pci.c | 5 |
3 files changed, 1 insertions, 8 deletions
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c index 7477dac628b4..5772ebb3a69e 100644 --- a/drivers/media/dvb/mantis/mantis_hif.c +++ b/drivers/media/dvb/mantis/mantis_hif.c | |||
@@ -22,8 +22,6 @@ | |||
22 | #include <linux/signal.h> | 22 | #include <linux/signal.h> |
23 | #include <linux/sched.h> | 23 | #include <linux/sched.h> |
24 | 24 | ||
25 | #include <linux/signal.h> | ||
26 | #include <linux/sched.h> | ||
27 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
28 | 26 | ||
29 | #include "dmxdev.h" | 27 | #include "dmxdev.h" |
diff --git a/drivers/media/dvb/mantis/mantis_input.c b/drivers/media/dvb/mantis/mantis_input.c index 6a9df779441f..4675a3b53c7d 100644 --- a/drivers/media/dvb/mantis/mantis_input.c +++ b/drivers/media/dvb/mantis/mantis_input.c | |||
@@ -126,7 +126,7 @@ int mantis_input_init(struct mantis_pci *mantis) | |||
126 | rc->id.version = 1; | 126 | rc->id.version = 1; |
127 | rc->dev = mantis->pdev->dev; | 127 | rc->dev = mantis->pdev->dev; |
128 | 128 | ||
129 | err = ir_input_register(rc, &ir_mantis); | 129 | err = ir_input_register(rc, &ir_mantis, NULL); |
130 | if (err) { | 130 | if (err) { |
131 | dprintk(MANTIS_ERROR, 1, "IR device registration failed, ret = %d", err); | 131 | dprintk(MANTIS_ERROR, 1, "IR device registration failed, ret = %d", err); |
132 | input_free_device(rc); | 132 | input_free_device(rc); |
diff --git a/drivers/media/dvb/mantis/mantis_pci.c b/drivers/media/dvb/mantis/mantis_pci.c index 6c7534af6b44..59feeb84aec7 100644 --- a/drivers/media/dvb/mantis/mantis_pci.c +++ b/drivers/media/dvb/mantis/mantis_pci.c | |||
@@ -41,11 +41,6 @@ | |||
41 | #include "dvb_frontend.h" | 41 | #include "dvb_frontend.h" |
42 | #include "dvb_net.h" | 42 | #include "dvb_net.h" |
43 | 43 | ||
44 | #include <asm/irq.h> | ||
45 | #include <linux/signal.h> | ||
46 | #include <linux/sched.h> | ||
47 | #include <linux/interrupt.h> | ||
48 | |||
49 | #include "mantis_common.h" | 44 | #include "mantis_common.h" |
50 | #include "mantis_reg.h" | 45 | #include "mantis_reg.h" |
51 | #include "mantis_pci.h" | 46 | #include "mantis_pci.h" |