diff options
Diffstat (limited to 'drivers/input/keyboard/spitzkbd.c')
-rw-r--r-- | drivers/input/keyboard/spitzkbd.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/input/keyboard/spitzkbd.c b/drivers/input/keyboard/spitzkbd.c index c5d03fb77bcb..e385710233f4 100644 --- a/drivers/input/keyboard/spitzkbd.c +++ b/drivers/input/keyboard/spitzkbd.c | |||
@@ -410,7 +410,7 @@ static int __init spitzkbd_probe(struct platform_device *dev) | |||
410 | for (i = 0; i < SPITZ_KEY_SENSE_NUM; i++) { | 410 | for (i = 0; i < SPITZ_KEY_SENSE_NUM; i++) { |
411 | pxa_gpio_mode(spitz_senses[i] | GPIO_IN); | 411 | pxa_gpio_mode(spitz_senses[i] | GPIO_IN); |
412 | if (request_irq(IRQ_GPIO(spitz_senses[i]), spitzkbd_interrupt, | 412 | if (request_irq(IRQ_GPIO(spitz_senses[i]), spitzkbd_interrupt, |
413 | SA_INTERRUPT|SA_TRIGGER_RISING, | 413 | IRQF_DISABLED|IRQF_TRIGGER_RISING, |
414 | "Spitzkbd Sense", spitzkbd)) | 414 | "Spitzkbd Sense", spitzkbd)) |
415 | printk(KERN_WARNING "spitzkbd: Can't get Sense IRQ: %d!\n", i); | 415 | printk(KERN_WARNING "spitzkbd: Can't get Sense IRQ: %d!\n", i); |
416 | } | 416 | } |
@@ -425,19 +425,19 @@ static int __init spitzkbd_probe(struct platform_device *dev) | |||
425 | pxa_gpio_mode(SPITZ_GPIO_SWB | GPIO_IN); | 425 | pxa_gpio_mode(SPITZ_GPIO_SWB | GPIO_IN); |
426 | 426 | ||
427 | request_irq(SPITZ_IRQ_GPIO_SYNC, spitzkbd_interrupt, | 427 | request_irq(SPITZ_IRQ_GPIO_SYNC, spitzkbd_interrupt, |
428 | SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING, | 428 | IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, |
429 | "Spitzkbd Sync", spitzkbd); | 429 | "Spitzkbd Sync", spitzkbd); |
430 | request_irq(SPITZ_IRQ_GPIO_ON_KEY, spitzkbd_interrupt, | 430 | request_irq(SPITZ_IRQ_GPIO_ON_KEY, spitzkbd_interrupt, |
431 | SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING, | 431 | IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, |
432 | "Spitzkbd PwrOn", spitzkbd); | 432 | "Spitzkbd PwrOn", spitzkbd); |
433 | request_irq(SPITZ_IRQ_GPIO_SWA, spitzkbd_hinge_isr, | 433 | request_irq(SPITZ_IRQ_GPIO_SWA, spitzkbd_hinge_isr, |
434 | SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING, | 434 | IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, |
435 | "Spitzkbd SWA", spitzkbd); | 435 | "Spitzkbd SWA", spitzkbd); |
436 | request_irq(SPITZ_IRQ_GPIO_SWB, spitzkbd_hinge_isr, | 436 | request_irq(SPITZ_IRQ_GPIO_SWB, spitzkbd_hinge_isr, |
437 | SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING, | 437 | IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, |
438 | "Spitzkbd SWB", spitzkbd); | 438 | "Spitzkbd SWB", spitzkbd); |
439 | request_irq(SPITZ_IRQ_GPIO_AK_INT, spitzkbd_hinge_isr, | 439 | request_irq(SPITZ_IRQ_GPIO_AK_INT, spitzkbd_hinge_isr, |
440 | SA_INTERRUPT | SA_TRIGGER_RISING | SA_TRIGGER_FALLING, | 440 | IRQF_DISABLED | IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING, |
441 | "Spitzkbd HP", spitzkbd); | 441 | "Spitzkbd HP", spitzkbd); |
442 | 442 | ||
443 | printk(KERN_INFO "input: Spitz Keyboard Registered\n"); | 443 | printk(KERN_INFO "input: Spitz Keyboard Registered\n"); |