diff options
Diffstat (limited to 'drivers/mfd')
-rw-r--r-- | drivers/mfd/ucb1x00-core.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/mfd/ucb1x00-core.c b/drivers/mfd/ucb1x00-core.c index e335d54c4659..b42e0fbab59b 100644 --- a/drivers/mfd/ucb1x00-core.c +++ b/drivers/mfd/ucb1x00-core.c | |||
@@ -27,7 +27,6 @@ | |||
27 | 27 | ||
28 | #include <asm/dma.h> | 28 | #include <asm/dma.h> |
29 | #include <asm/hardware.h> | 29 | #include <asm/hardware.h> |
30 | #include <asm/irq.h> | ||
31 | 30 | ||
32 | #include "ucb1x00.h" | 31 | #include "ucb1x00.h" |
33 | 32 | ||
@@ -507,14 +506,14 @@ static int ucb1x00_probe(struct mcp *mcp) | |||
507 | goto err_free; | 506 | goto err_free; |
508 | } | 507 | } |
509 | 508 | ||
510 | ret = request_irq(ucb->irq, ucb1x00_irq, 0, "UCB1x00", ucb); | 509 | ret = request_irq(ucb->irq, ucb1x00_irq, SA_TRIGGER_RISING, |
510 | "UCB1x00", ucb); | ||
511 | if (ret) { | 511 | if (ret) { |
512 | printk(KERN_ERR "ucb1x00: unable to grab irq%d: %d\n", | 512 | printk(KERN_ERR "ucb1x00: unable to grab irq%d: %d\n", |
513 | ucb->irq, ret); | 513 | ucb->irq, ret); |
514 | goto err_free; | 514 | goto err_free; |
515 | } | 515 | } |
516 | 516 | ||
517 | set_irq_type(ucb->irq, IRQT_RISING); | ||
518 | mcp_set_drvdata(mcp, ucb); | 517 | mcp_set_drvdata(mcp, ucb); |
519 | 518 | ||
520 | ret = class_device_register(&ucb->cdev); | 519 | ret = class_device_register(&ucb->cdev); |