[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>

3 files changed, 9 insertions, 5 deletions

diff --git a/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c b/arch/powerpc/platforms/86xx/mpc86xx_hpcn.c
index 146da3001c67..813eb5811eb4 100644
--- 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 bc5139043112..a8c8f0a44055 100644
--- 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 f260382739fa..2d6ad859df7f 100644
--- 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