diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2011-11-01 04:52:53 +0400 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-11-01 04:52:53 +0400 |
| commit | be4af5dfa6d976ba579bae16ff8714b755d44dad (patch) | |
| tree | edecd9bd4757a4fe7bdf4dc13e087d6a174fdc12 /drivers/i2c/busses/i2c-bfin-twi.c | |
| parent | ce0fda16084905d035e8ceb51cf42740ad781b15 (diff) | |
| parent | 4311051c358ad0e66b68934e7a33cf10ba533466 (diff) | |
| download | linux-be4af5dfa6d976ba579bae16ff8714b755d44dad.tar.xz | |
Merge branch 'for-32/i2c/irqflags' into for-linus/i2c-3.2
Conflicts:
drivers/i2c/busses/i2c-designware-core.c
Fixed up merge conflic
Diffstat (limited to 'drivers/i2c/busses/i2c-bfin-twi.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-bfin-twi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/i2c/busses/i2c-bfin-twi.c b/drivers/i2c/busses/i2c-bfin-twi.c index cbc98aea5b09..cdb59e5b23f7 100644 --- a/drivers/i2c/busses/i2c-bfin-twi.c +++ b/drivers/i2c/busses/i2c-bfin-twi.c @@ -631,7 +631,7 @@ static int i2c_bfin_twi_resume(struct platform_device *pdev) struct bfin_twi_iface *iface = platform_get_drvdata(pdev); int rc = request_irq(iface->irq, bfin_twi_interrupt_entry, - IRQF_DISABLED, pdev->name, iface); + 0, pdev->name, iface); if (rc) { dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq); return -ENODEV; @@ -702,7 +702,7 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev) } rc = request_irq(iface->irq, bfin_twi_interrupt_entry, - IRQF_DISABLED, pdev->name, iface); + 0, pdev->name, iface); if (rc) { dev_err(&pdev->dev, "Can't get IRQ %d !\n", iface->irq); rc = -ENODEV; |