diff options
-rw-r--r-- | arch/powerpc/platforms/86xx/mpc86xx_hpcn.c | 9 | ||||
-rw-r--r-- | arch/powerpc/platforms/86xx/pci.c | 3 | ||||
-rw-r--r-- | include/asm-powerpc/mpc86xx.h | 2 |
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 4a33d95e7ad7..496cc7c3a54c 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; | |||
52 | #endif | 52 | #endif |
53 | 53 | ||
54 | 54 | ||
55 | #ifdef CONFIG_PCI | ||
55 | static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc, | 56 | static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc, |
56 | struct pt_regs *regs) | 57 | struct pt_regs *regs) |
57 | { | 58 | { |
@@ -60,14 +61,18 @@ static void mpc86xx_8259_cascade(unsigned int irq, struct irq_desc *desc, | |||
60 | generic_handle_irq(cascade_irq, regs); | 61 | generic_handle_irq(cascade_irq, regs); |
61 | desc->chip->eoi(irq); | 62 | desc->chip->eoi(irq); |
62 | } | 63 | } |
64 | #endif /* CONFIG_PCI */ | ||
63 | 65 | ||
64 | void __init | 66 | void __init |
65 | mpc86xx_hpcn_init_irq(void) | 67 | mpc86xx_hpcn_init_irq(void) |
66 | { | 68 | { |
67 | struct mpic *mpic1; | 69 | struct mpic *mpic1; |
68 | struct device_node *np, *cascade_node = NULL; | 70 | struct device_node *np; |
69 | int cascade_irq; | ||
70 | phys_addr_t openpic_paddr; | 71 | phys_addr_t openpic_paddr; |
72 | #ifdef CONFIG_PCI | ||
73 | struct device_node *cascade_node = NULL; | ||
74 | int cascade_irq; | ||
75 | #endif | ||
71 | 76 | ||
72 | np = of_find_node_by_type(NULL, "open-pic"); | 77 | np = of_find_node_by_type(NULL, "open-pic"); |
73 | if (np == NULL) | 78 | if (np == NULL) |
diff --git a/arch/powerpc/platforms/86xx/pci.c b/arch/powerpc/platforms/86xx/pci.c index d7050c1108ff..481e18ed5be9 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) | |||
188 | 188 | ||
189 | printk(KERN_INFO "Found MPC86xx PCIE host bridge at 0x%08lx. " | 189 | printk(KERN_INFO "Found MPC86xx PCIE host bridge at 0x%08lx. " |
190 | "Firmware bus number: %d->%d\n", | 190 | "Firmware bus number: %d->%d\n", |
191 | rsrc.start, hose->first_busno, hose->last_busno); | 191 | (unsigned long) rsrc.start, |
192 | hose->first_busno, hose->last_busno); | ||
192 | 193 | ||
193 | DBG(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n", | 194 | DBG(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n", |
194 | hose, hose->cfg_addr, hose->cfg_data); | 195 | 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 @@ | |||
23 | #define _ISA_MEM_BASE isa_mem_base | 23 | #define _ISA_MEM_BASE isa_mem_base |
24 | #ifdef CONFIG_PCI | 24 | #ifdef CONFIG_PCI |
25 | #define PCI_DRAM_OFFSET pci_dram_offset | 25 | #define PCI_DRAM_OFFSET pci_dram_offset |
26 | #else | ||
27 | #define PCI_DRAM_OFFSET 0 | ||
28 | #endif | 26 | #endif |
29 | 27 | ||
30 | #define CPU0_BOOT_RELEASE 0x01000000 | 28 | #define CPU0_BOOT_RELEASE 0x01000000 |