diff options
Diffstat (limited to 'drivers/video')
-rw-r--r-- | drivers/video/arcfb.c | 2 | ||||
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 2 | ||||
-rw-r--r-- | drivers/video/au1200fb.c | 2 | ||||
-rw-r--r-- | drivers/video/matrox/matroxfb_base.c | 2 | ||||
-rw-r--r-- | drivers/video/pxafb.c | 2 | ||||
-rw-r--r-- | drivers/video/s3c2410fb.c | 2 | ||||
-rw-r--r-- | drivers/video/sa1100fb.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c index 466042808daf..fd95c2dbd4f7 100644 --- a/drivers/video/arcfb.c +++ b/drivers/video/arcfb.c | |||
@@ -561,7 +561,7 @@ static int __init arcfb_probe(struct platform_device *dev) | |||
561 | platform_set_drvdata(dev, info); | 561 | platform_set_drvdata(dev, info); |
562 | if (irq) { | 562 | if (irq) { |
563 | par->irq = irq; | 563 | par->irq = irq; |
564 | if (request_irq(par->irq, &arcfb_interrupt, SA_SHIRQ, | 564 | if (request_irq(par->irq, &arcfb_interrupt, IRQF_SHARED, |
565 | "arcfb", info)) { | 565 | "arcfb", info)) { |
566 | printk(KERN_INFO | 566 | printk(KERN_INFO |
567 | "arcfb: Failed req IRQ %d\n", par->irq); | 567 | "arcfb: Failed req IRQ %d\n", par->irq); |
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 85fcd22e6ed5..0c9706746d79 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -1567,7 +1567,7 @@ static int aty_enable_irq(struct atyfb_par *par, int reenable) | |||
1567 | u32 int_cntl; | 1567 | u32 int_cntl; |
1568 | 1568 | ||
1569 | if (!test_and_set_bit(0, &par->irq_flags)) { | 1569 | if (!test_and_set_bit(0, &par->irq_flags)) { |
1570 | if (request_irq(par->irq, aty_irq, SA_SHIRQ, "atyfb", par)) { | 1570 | if (request_irq(par->irq, aty_irq, IRQF_SHARED, "atyfb", par)) { |
1571 | clear_bit(0, &par->irq_flags); | 1571 | clear_bit(0, &par->irq_flags); |
1572 | return -EINVAL; | 1572 | return -EINVAL; |
1573 | } | 1573 | } |
diff --git a/drivers/video/au1200fb.c b/drivers/video/au1200fb.c index 600d3e0e08b7..c6a5f0ccc107 100644 --- a/drivers/video/au1200fb.c +++ b/drivers/video/au1200fb.c | |||
@@ -1694,7 +1694,7 @@ static int au1200fb_drv_probe(struct device *dev) | |||
1694 | 1694 | ||
1695 | /* Now hook interrupt too */ | 1695 | /* Now hook interrupt too */ |
1696 | if ((ret = request_irq(AU1200_LCD_INT, au1200fb_handle_irq, | 1696 | if ((ret = request_irq(AU1200_LCD_INT, au1200fb_handle_irq, |
1697 | SA_INTERRUPT | SA_SHIRQ, "lcd", (void *)dev)) < 0) { | 1697 | IRQF_DISABLED | IRQF_SHARED, "lcd", (void *)dev)) < 0) { |
1698 | print_err("fail to request interrupt line %d (err: %d)", | 1698 | print_err("fail to request interrupt line %d (err: %d)", |
1699 | AU1200_LCD_INT, ret); | 1699 | AU1200_LCD_INT, ret); |
1700 | goto failed; | 1700 | goto failed; |
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index 8b5bf7972ee3..4a57dabb77d4 100644 --- a/drivers/video/matrox/matroxfb_base.c +++ b/drivers/video/matrox/matroxfb_base.c | |||
@@ -233,7 +233,7 @@ int matroxfb_enable_irq(WPMINFO int reenable) { | |||
233 | 233 | ||
234 | if (!test_and_set_bit(0, &ACCESS_FBINFO(irq_flags))) { | 234 | if (!test_and_set_bit(0, &ACCESS_FBINFO(irq_flags))) { |
235 | if (request_irq(ACCESS_FBINFO(pcidev)->irq, matrox_irq, | 235 | if (request_irq(ACCESS_FBINFO(pcidev)->irq, matrox_irq, |
236 | SA_SHIRQ, "matroxfb", MINFO)) { | 236 | IRQF_SHARED, "matroxfb", MINFO)) { |
237 | clear_bit(0, &ACCESS_FBINFO(irq_flags)); | 237 | clear_bit(0, &ACCESS_FBINFO(irq_flags)); |
238 | return -EINVAL; | 238 | return -EINVAL; |
239 | } | 239 | } |
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 54663a9baf43..bbb07106cd54 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
@@ -1334,7 +1334,7 @@ int __init pxafb_probe(struct platform_device *dev) | |||
1334 | goto failed; | 1334 | goto failed; |
1335 | } | 1335 | } |
1336 | 1336 | ||
1337 | ret = request_irq(IRQ_LCD, pxafb_handle_irq, SA_INTERRUPT, "LCD", fbi); | 1337 | ret = request_irq(IRQ_LCD, pxafb_handle_irq, IRQF_DISABLED, "LCD", fbi); |
1338 | if (ret) { | 1338 | if (ret) { |
1339 | dev_err(&dev->dev, "request_irq failed: %d\n", ret); | 1339 | dev_err(&dev->dev, "request_irq failed: %d\n", ret); |
1340 | ret = -EBUSY; | 1340 | ret = -EBUSY; |
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c index fbc411850686..f461eb10cc79 100644 --- a/drivers/video/s3c2410fb.c +++ b/drivers/video/s3c2410fb.c | |||
@@ -735,7 +735,7 @@ static int __init s3c2410fb_probe(struct platform_device *pdev) | |||
735 | 735 | ||
736 | dprintk("got LCD region\n"); | 736 | dprintk("got LCD region\n"); |
737 | 737 | ||
738 | ret = request_irq(irq, s3c2410fb_irq, SA_INTERRUPT, pdev->name, info); | 738 | ret = request_irq(irq, s3c2410fb_irq, IRQF_DISABLED, pdev->name, info); |
739 | if (ret) { | 739 | if (ret) { |
740 | dev_err(&pdev->dev, "cannot get irq %d - err %d\n", irq, ret); | 740 | dev_err(&pdev->dev, "cannot get irq %d - err %d\n", irq, ret); |
741 | ret = -EBUSY; | 741 | ret = -EBUSY; |
diff --git a/drivers/video/sa1100fb.c b/drivers/video/sa1100fb.c index 553fd84af44f..a2e6e7205d7e 100644 --- a/drivers/video/sa1100fb.c +++ b/drivers/video/sa1100fb.c | |||
@@ -1472,7 +1472,7 @@ static int __init sa1100fb_probe(struct platform_device *pdev) | |||
1472 | if (ret) | 1472 | if (ret) |
1473 | goto failed; | 1473 | goto failed; |
1474 | 1474 | ||
1475 | ret = request_irq(irq, sa1100fb_handle_irq, SA_INTERRUPT, | 1475 | ret = request_irq(irq, sa1100fb_handle_irq, IRQF_DISABLED, |
1476 | "LCD", fbi); | 1476 | "LCD", fbi); |
1477 | if (ret) { | 1477 | if (ret) { |
1478 | printk(KERN_ERR "sa1100fb: request_irq failed: %d\n", ret); | 1478 | printk(KERN_ERR "sa1100fb: request_irq failed: %d\n", ret); |