summaryrefslogtreecommitdiff
path: root/drivers/video/bfin_adv7393fb.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2011-11-04 07:32:20 +0400
committerGrant Likely <grant.likely@secretlab.ca>2011-11-04 07:32:20 +0400
commit3983138c017b6aeab6ce3dbb1e9afbe80bdac496 (patch)
tree9fdcddfdb8ada91504c90e2551ba6a565ade7325 /drivers/video/bfin_adv7393fb.c
parented5f886d16369fed5a69d96b8e85777c47206de1 (diff)
parent02aac316abf436a7529d46a71f7083f9f9ef4b49 (diff)
downloadlinux-3983138c017b6aeab6ce3dbb1e9afbe80bdac496.tar.xz
Merge branch 'for-grant' of git://sources.calxeda.com/kernel/linux into devicetree/merge
Diffstat (limited to 'drivers/video/bfin_adv7393fb.c')
-rw-r--r--drivers/video/bfin_adv7393fb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/bfin_adv7393fb.c b/drivers/video/bfin_adv7393fb.c
index 8486f541156b..811dd7f6aa41 100644
--- a/drivers/video/bfin_adv7393fb.c
+++ b/drivers/video/bfin_adv7393fb.c
@@ -481,7 +481,7 @@ static int __devinit bfin_adv7393_fb_probe(struct i2c_client *client,
goto out_4;
}
- if (request_irq(IRQ_PPI_ERROR, ppi_irq_error, IRQF_DISABLED,
+ if (request_irq(IRQ_PPI_ERROR, ppi_irq_error, 0,
"PPI ERROR", fbdev) < 0) {
dev_err(&client->dev, "unable to request PPI ERROR IRQ\n");
ret = -EFAULT;