Merge branch 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

* 'of-pci' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  pci/of: Consolidate pci_bus_to_OF_node()
  pci/of: Consolidate pci_device_to_OF_node()
  x86/devicetree: Use generic PCI <-> OF matching
  microblaze/pci: Move the remains of pci_32.c to pci-common.c
  microblaze/pci: Remove powermac originated cruft
  pci/of: Match PCI devices to OF nodes dynamically

diff --cc arch/sparc/include/asm/pci_32.h
index 862e3ce92b15d45659c1ca343a3ad317c9dfb7b3,4d0c39a931c59a4ac1dcc75c03d1e67ec8676edb..02939abd356cf80e26a0e93b0cba7861f9f7d946
--- 1/arch/sparc/include/asm/pci_32.h
--- 2/arch/sparc/include/asm/pci_32.h
+++ b/arch/sparc/include/asm/pci_32.h
@@@ -42,36 -42,9 +42,33 @@@ static inline void pci_dma_burst_advice
  }
  #endif
  
- struct device_node;
- extern struct device_node *pci_device_to_OF_node(struct pci_dev *pdev);
- 
  #endif /* __KERNEL__ */
  
 +#ifndef CONFIG_LEON_PCI
  /* generic pci stuff */
  #include <asm-generic/pci.h>
 +#else
 +/*
 + * On LEON PCI Memory space is mapped 1:1 with physical address space.
 + *
 + * I/O space is located at low 64Kbytes in PCI I/O space. The I/O addresses
 + * are converted into CPU addresses to virtual addresses that are mapped with
 + * MMU to the PCI Host PCI I/O space window which are translated to the low
 + * 64Kbytes by the Host controller.
 + */
 +
 +extern void
 +pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
 +                      struct resource *res);
 +
 +extern void
 +pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
 +                      struct pci_bus_region *region);
 +
 +static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
 +{
 +      return PCI_IRQ_NONE;
 +}
 +#endif
  
  #endif /* __SPARC_PCI_H */

diff --cc arch/x86/kernel/devicetree.c
Simple merge

diff --cc drivers/pci/Makefile
Simple merge

diff --cc drivers/pci/probe.c
Simple merge