Merge ../linux-2.6-watchdog-mm

[linux-drm-fsl-dcu.git] / arch / powerpc / platforms / 86xx / mpc86xx_hpcn.c

diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 0b1b52168bb705204dc91dc04c3a9c2246eaf694..1a1c226ad4d960a76ddc076224b5944f99370938 100644 (file)
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -53,12 +53,11 @@ unsigned long pci_dram_offset = 0;
 
 
 #ifdef CONFIG_PCI
-static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc,
-                                struct pt_regs *regs)
+static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc)
 {
-       unsigned int cascade_irq = i8259_irq(regs);
+       unsigned int cascade_irq = i8259_irq();
        if (cascade_irq != NO_IRQ)
-               generic_handle_irq(cascade_irq, regs);
+               generic_handle_irq(cascade_irq);
        desc->chip->eoi(irq);
 }
 #endif /* CONFIG_PCI */
@@ -158,7 +157,7 @@ get_pci_irq_from_of(struct pci_controller *hose, int slot, int pin)
 
        laddr[0] = (hose->first_busno << 16) | (PCI_DEVFN(slot, 0) << 8);
        laddr[1] = laddr[2] = 0;
-       of_irq_map_raw(hosenode, &pin, laddr, &oirq);
+       of_irq_map_raw(hosenode, &pin, 1, laddr, &oirq);
        DBG("mpc86xx_hpcn: pci irq addr %x, slot %d, pin %d, irq %d\n",
                        laddr[0], slot, pin, oirq.specifier[0]);
        return oirq.specifier[0];
@@ -347,9 +346,9 @@ mpc86xx_hpcn_setup_arch(void)
 
        np = of_find_node_by_type(NULL, "cpu");
        if (np != 0) {
-               unsigned int *fp;
+               const unsigned int *fp;
 
-               fp = (int *)get_property(np, "clock-frequency", NULL);
+               fp = get_property(np, "clock-frequency", NULL);
                if (fp != 0)
                        loops_per_jiffy = *fp / HZ;
                else