[POWERPC] Allow MPC8641 HPCN to build with CONFIG_PCI disabled too.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 4a33d95e7ad75f3fa442a5d7301fc82bd19a2cd8..496cc7c3a54c448995b567e76dc25491a4e45e54 100644 (file)
--- a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
+++ b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
@@ -52,6 +52,7 @@ unsigned long pci_dram_offset = 0;
 #endif
 
 
+#ifdef CONFIG_PCI
 static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc,
                                 struct pt_regs *regs)
 {
@@ -60,14 +61,18 @@ static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc,
                generic_handle_irq(cascade_irq, regs);
        desc->chip->eoi(irq);
 }
+#endif /* CONFIG_PCI */
 
 void __init
 mpc86xx_hpcn_init_irq(void)
 {
        struct mpic *mpic1;
-       struct device_node *np, *cascade_node = NULL;
-       int cascade_irq;
+       struct device_node *np;
        phys_addr_t openpic_paddr;
+#ifdef CONFIG_PCI
+       struct device_node *cascade_node = NULL;
+       int cascade_irq;
+#endif
 
        np = of_find_node_by_type(NULL, "open-pic");
        if (np == NULL)

diff --git a/arch/powerpc/platforms/86xx/pci.c b/arch/powerpc/platforms/86xx/pci.c
index d7050c1108ff1bbcc0d6ba8dadef37f9ca6057ee..481e18ed5be94ff7ea65abc6b3a9586567d1ec4a 100644 (file)
--- a/arch/powerpc/platforms/86xx/pci.c
+++ b/arch/powerpc/platforms/86xx/pci.c
@@ -188,7 +188,8 @@ int __init add_bridge(struct device_node *dev)
 
        printk(KERN_INFO "Found MPC86xx PCIE host bridge at 0x%08lx. "
               "Firmware bus number: %d->%d\n",
-               rsrc.start, hose->first_busno, hose->last_busno);
+              (unsigned long) rsrc.start,
+              hose->first_busno, hose->last_busno);
 
        DBG(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n",
                hose, hose->cfg_addr, hose->cfg_data);

diff --git a/include/asm-powerpc/mpc86xx.h b/include/asm-powerpc/mpc86xx.h
index f260382739faa81018e2f63c066432da9ece11a7..2d6ad859df7f58148f2e55de8d557a0bfe4ddc6f 100644 (file)
--- a/include/asm-powerpc/mpc86xx.h
+++ b/include/asm-powerpc/mpc86xx.h
@@ -23,8 +23,6 @@
 #define _ISA_MEM_BASE   isa_mem_base
 #ifdef CONFIG_PCI
 #define PCI_DRAM_OFFSET pci_dram_offset
-#else
-#define PCI_DRAM_OFFSET 0
 #endif
 
 #define CPU0_BOOT_RELEASE 0x01000000