Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / arch / ppc / syslib / m82xx_pci.c

diff --git a/arch/ppc/syslib/m82xx_pci.c b/arch/ppc/syslib/m82xx_pci.c
index d3fa264e179e345d1b0107606ec01b6adbfd107b..fe860d52e2e4c1e3d6a2c2a9cc41fe96bb98e519 100644 (file)
--- a/arch/ppc/syslib/m82xx_pci.c
+++ b/arch/ppc/syslib/m82xx_pci.c
@@ -117,7 +117,7 @@ struct hw_interrupt_type pq2pci_ic = {
 };
 
 static irqreturn_t
-pq2pci_irq_demux(int irq, void *dev_id, struct pt_regs *regs)
+pq2pci_irq_demux(int irq, void *dev_id)
 {
        unsigned long stat, mask, pend;
        int bit;
@@ -130,7 +130,7 @@ pq2pci_irq_demux(int irq, void *dev_id, struct pt_regs *regs)
                        break;
                for (bit = 0; pend != 0; ++bit, pend <<= 1) {
                        if (pend & 0x80000000)
-                               __do_IRQ(NR_CPM_INTS + bit, regs);
+                               __do_IRQ(NR_CPM_INTS + bit);
                }
        }
 
@@ -197,7 +197,7 @@ pq2ads_setup_pci(struct pci_controller *hose)
           CPM high             0b0000
           CPM middle           0b0001
           CPM low              0b0010
-          PCI reguest          0b0011
+          PCI request          0b0011
           Reserved             0b0100
           Reserved             0b0101
           Internal Core        0b0110