diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2011-11-01 00:52:53 +0000 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2011-11-01 00:52:53 +0000 |
| commit | be4af5dfa6d976ba579bae16ff8714b755d44dad (patch) | |
| tree | edecd9bd4757a4fe7bdf4dc13e087d6a174fdc12 /drivers/i2c/busses/i2c-s3c2410.c | |
| parent | ce0fda16084905d035e8ceb51cf42740ad781b15 (diff) | |
| parent | 4311051c358ad0e66b68934e7a33cf10ba533466 (diff) | |
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-s3c2410.c')
| -rw-r--r-- | drivers/i2c/busses/i2c-s3c2410.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c index f84a63c6dd9..545ca88a915 100644 --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -883,7 +883,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev) goto err_iomap; } - ret = request_irq(i2c->irq, s3c24xx_i2c_irq, IRQF_DISABLED, + ret = request_irq(i2c->irq, s3c24xx_i2c_irq, 0, dev_name(&pdev->dev), i2c); if (ret != 0) { |