[ALSA] hda: fix typo for xw4400 PCI sub-ID

[linux-2.6-omap-h63xx.git] / drivers / video / arcfb.c

diff --git a/drivers/video/arcfb.c b/drivers/video/arcfb.c
index 466042808dafabec885e89da3b103712a8908ac7..ab34b96acc317b659b32616e09e228911f0638a3 100644 (file)
--- a/drivers/video/arcfb.c
+++ b/drivers/video/arcfb.c
@@ -39,7 +39,6 @@
 #include <linux/errno.h>
 #include <linux/string.h>
 #include <linux/mm.h>
-#include <linux/tty.h>
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/delay.h>
@@ -219,8 +218,7 @@ static int arcfb_pan_display(struct fb_var_screeninfo *var,
        return -EINVAL;
 }
 
-static irqreturn_t arcfb_interrupt(int vec, void *dev_instance,
-               struct pt_regs *regs)
+static irqreturn_t arcfb_interrupt(int vec, void *dev_instance)
 {
        struct fb_info *info = dev_instance;
        unsigned char ctl2status;
@@ -561,7 +559,7 @@ static int __init arcfb_probe(struct platform_device *dev)
        platform_set_drvdata(dev, info);
        if (irq) {
                par->irq = irq;
-               if (request_irq(par->irq, &arcfb_interrupt, SA_SHIRQ,
+               if (request_irq(par->irq, &arcfb_interrupt, IRQF_SHARED,
                                "arcfb", info)) {
                        printk(KERN_INFO
                                "arcfb: Failed req IRQ %d\n", par->irq);