aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/powerpc/include/asm/pci-bridge.h6
-rw-r--r--arch/powerpc/kernel/pci_32.c8
-rw-r--r--drivers/pci/Makefile1
3 files changed, 0 insertions, 15 deletions
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h
index 0dbf66bdb01d..4c61fa0b8d75 100644
--- a/arch/powerpc/include/asm/pci-bridge.h
+++ b/arch/powerpc/include/asm/pci-bridge.h
@@ -86,17 +86,12 @@ struct pci_controller {
86 void *io_base_alloc; 86 void *io_base_alloc;
87#endif 87#endif
88 resource_size_t io_base_phys; 88 resource_size_t io_base_phys;
89#ifndef CONFIG_PPC64
90 resource_size_t pci_io_size; 89 resource_size_t pci_io_size;
91#endif
92 90
93 /* Some machines (PReP) have a non 1:1 mapping of 91 /* Some machines (PReP) have a non 1:1 mapping of
94 * the PCI memory space in the CPU bus space 92 * the PCI memory space in the CPU bus space
95 */ 93 */
96 resource_size_t pci_mem_offset; 94 resource_size_t pci_mem_offset;
97#ifdef CONFIG_PPC64
98 unsigned long pci_io_size;
99#endif
100 95
101 /* Some machines have a special region to forward the ISA 96 /* Some machines have a special region to forward the ISA
102 * "memory" cycles such as VGA memory regions. Left to 0 97 * "memory" cycles such as VGA memory regions. Left to 0
@@ -187,7 +182,6 @@ extern int early_find_capability(struct pci_controller *hose, int bus,
187extern void setup_indirect_pci(struct pci_controller* hose, 182extern void setup_indirect_pci(struct pci_controller* hose,
188 resource_size_t cfg_addr, 183 resource_size_t cfg_addr,
189 resource_size_t cfg_data, u32 flags); 184 resource_size_t cfg_data, u32 flags);
190extern void setup_grackle(struct pci_controller *hose);
191#else /* CONFIG_PPC64 */ 185#else /* CONFIG_PPC64 */
192 186
193/* 187/*
diff --git a/arch/powerpc/kernel/pci_32.c b/arch/powerpc/kernel/pci_32.c
index d473634e39e3..529e677fdab1 100644
--- a/arch/powerpc/kernel/pci_32.c
+++ b/arch/powerpc/kernel/pci_32.c
@@ -447,14 +447,6 @@ static int __init pcibios_init(void)
447 447
448subsys_initcall(pcibios_init); 448subsys_initcall(pcibios_init);
449 449
450/* the next one is stolen from the alpha port... */
451void __init
452pcibios_update_irq(struct pci_dev *dev, int irq)
453{
454 pci_write_config_byte(dev, PCI_INTERRUPT_LINE, irq);
455 /* XXX FIXME - update OF device tree node interrupt property */
456}
457
458static struct pci_controller* 450static struct pci_controller*
459pci_bus_to_hose(int bus) 451pci_bus_to_hose(int bus)
460{ 452{
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile
index ba6af162fd39..b77ae6794275 100644
--- a/drivers/pci/Makefile
+++ b/drivers/pci/Makefile
@@ -39,7 +39,6 @@ obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o
39obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o 39obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o
40obj-$(CONFIG_PARISC) += setup-bus.o 40obj-$(CONFIG_PARISC) += setup-bus.o
41obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o 41obj-$(CONFIG_SUPERH) += setup-bus.o setup-irq.o
42obj-$(CONFIG_PPC32) += setup-irq.o
43obj-$(CONFIG_PPC) += setup-bus.o 42obj-$(CONFIG_PPC) += setup-bus.o
44obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o 43obj-$(CONFIG_MIPS) += setup-bus.o setup-irq.o
45obj-$(CONFIG_X86_VISWS) += setup-irq.o 44obj-$(CONFIG_X86_VISWS) += setup-irq.o