diff options
Diffstat (limited to 'drivers/input/serio')
-rw-r--r-- | drivers/input/serio/gscps2.c | 2 | ||||
-rw-r--r-- | drivers/input/serio/i8042.c | 4 | ||||
-rw-r--r-- | drivers/input/serio/pcips2.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/serio/gscps2.c b/drivers/input/serio/gscps2.c index 22d02d53eb16..cde036a92168 100644 --- a/drivers/input/serio/gscps2.c +++ b/drivers/input/serio/gscps2.c | |||
@@ -370,7 +370,7 @@ static int __init gscps2_probe(struct parisc_device *dev) | |||
370 | serio->dev.parent = &dev->dev; | 370 | serio->dev.parent = &dev->dev; |
371 | 371 | ||
372 | ret = -EBUSY; | 372 | ret = -EBUSY; |
373 | if (request_irq(dev->irq, gscps2_interrupt, SA_SHIRQ, ps2port->port->name, ps2port)) | 373 | if (request_irq(dev->irq, gscps2_interrupt, IRQF_SHARED, ps2port->port->name, ps2port)) |
374 | goto fail_miserably; | 374 | goto fail_miserably; |
375 | 375 | ||
376 | if (ps2port->id != GSC_ID_KEYBOARD && ps2port->id != GSC_ID_MOUSE) { | 376 | if (ps2port->id != GSC_ID_KEYBOARD && ps2port->id != GSC_ID_MOUSE) { |
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index 7fa4bc222583..06a3f25657dd 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c | |||
@@ -328,7 +328,7 @@ static int i8042_open(struct serio *serio) | |||
328 | return 0; | 328 | return 0; |
329 | 329 | ||
330 | if (request_irq(port->irq, i8042_interrupt, | 330 | if (request_irq(port->irq, i8042_interrupt, |
331 | SA_SHIRQ, "i8042", i8042_request_irq_cookie)) { | 331 | IRQF_SHARED, "i8042", i8042_request_irq_cookie)) { |
332 | printk(KERN_ERR "i8042.c: Can't get irq %d for %s, unregistering the port.\n", port->irq, port->name); | 332 | printk(KERN_ERR "i8042.c: Can't get irq %d for %s, unregistering the port.\n", port->irq, port->name); |
333 | goto irq_fail; | 333 | goto irq_fail; |
334 | } | 334 | } |
@@ -610,7 +610,7 @@ static int __devinit i8042_check_aux(void) | |||
610 | */ | 610 | */ |
611 | 611 | ||
612 | if (request_irq(i8042_ports[I8042_AUX_PORT_NO].irq, i8042_interrupt, | 612 | if (request_irq(i8042_ports[I8042_AUX_PORT_NO].irq, i8042_interrupt, |
613 | SA_SHIRQ, "i8042", &i8042_check_aux_cookie)) | 613 | IRQF_SHARED, "i8042", &i8042_check_aux_cookie)) |
614 | return -1; | 614 | return -1; |
615 | free_irq(i8042_ports[I8042_AUX_PORT_NO].irq, &i8042_check_aux_cookie); | 615 | free_irq(i8042_ports[I8042_AUX_PORT_NO].irq, &i8042_check_aux_cookie); |
616 | 616 | ||
diff --git a/drivers/input/serio/pcips2.c b/drivers/input/serio/pcips2.c index 1e139c5e59de..fb727c665253 100644 --- a/drivers/input/serio/pcips2.c +++ b/drivers/input/serio/pcips2.c | |||
@@ -107,7 +107,7 @@ static int pcips2_open(struct serio *io) | |||
107 | outb(PS2_CTRL_ENABLE, ps2if->base); | 107 | outb(PS2_CTRL_ENABLE, ps2if->base); |
108 | pcips2_flush_input(ps2if); | 108 | pcips2_flush_input(ps2if); |
109 | 109 | ||
110 | ret = request_irq(ps2if->dev->irq, pcips2_interrupt, SA_SHIRQ, | 110 | ret = request_irq(ps2if->dev->irq, pcips2_interrupt, IRQF_SHARED, |
111 | "pcips2", ps2if); | 111 | "pcips2", ps2if); |
112 | if (ret == 0) | 112 | if (ret == 0) |
113 | val = PS2_CTRL_ENABLE | PS2_CTRL_RXIRQ; | 113 | val = PS2_CTRL_ENABLE | PS2_CTRL_RXIRQ; |