Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...

[linux-2.6] / drivers / parport / parport_sunbpp.c

diff --git a/drivers/parport/parport_sunbpp.c b/drivers/parport/parport_sunbpp.c
index 69a4bbd4cbee9de856c5cc3e98a95ad0222fae3b..d758c90c86af4025e55968f926a1165a1e58ff0f 100644 (file)
--- a/drivers/parport/parport_sunbpp.c
+++ b/drivers/parport/parport_sunbpp.c
@@ -46,7 +46,7 @@
 #define dprintk(x)
 #endif
 
-static irqreturn_t parport_sunbpp_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t parport_sunbpp_interrupt(int irq, void *dev_id)
 {
        parport_generic_irq(irq, (struct parport *) dev_id, regs);
        return IRQ_HANDLED;
@@ -322,7 +322,7 @@ static int __devinit init_one_port(struct sbus_dev *sdev)
        p->size = size;
 
        if ((err = request_irq(p->irq, parport_sunbpp_interrupt,
-                              SA_SHIRQ, p->name, p)) != 0) {
+                              IRQF_SHARED, p->name, p)) != 0) {
                goto out_put_port;
        }
 
@@ -389,7 +389,7 @@ static struct of_device_id bpp_match[] = {
        {},
 };
 
-MODULE_DEVICE_TABLE(of, qec_sbus_match);
+MODULE_DEVICE_TABLE(of, bpp_match);
 
 static struct of_platform_driver bpp_sbus_driver = {
        .name           = "bpp",