Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

[powerpc.git] / drivers / media / video / stradis.c

diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c
index b36ba9f..525d812 100644 (file)
--- a/drivers/media/video/stradis.c
+++ b/drivers/media/video/stradis.c
@@ -406,7 +406,7 @@ static void send_osd_data(struct saa7146 *saa)
        }
 }
 
-static irqreturn_t saa7146_irq(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t saa7146_irq(int irq, void *dev_id)
 {
        struct saa7146 *saa = dev_id;
        u32 stat, astat;
@@ -2181,7 +2181,6 @@ static struct pci_device_id stradis_pci_tbl[] = {
        { 0 }
 };
 
-MODULE_DEVICE_TABLE(pci, stradis_pci_tbl);
 
 static struct pci_driver stradis_driver = {
        .name = "stradis",