From 84a4b4c3d73649ee3b1052b1cc11aae51a0d6b92 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Wed, 4 Apr 2012 21:20:01 +0200 Subject: [PATCH] --- yaml --- r: 298911 b: refs/heads/master c: d657784b70ef653350d7aa49da90a8484c29da7d h: refs/heads/master i: 298909: dd2c403315aeb5d6208582beff4eeb49f3972d82 298907: 7968278c2ebfcb569f20c4e93ce6b78853f2dd10 298903: d3d09fb7cf95beaadaaaec64f1564ae5dc70dc5a 298895: 8d8408de92a5e74f514e54b8eadbb11cf0cd4309 298879: 9da4e05cb182941a9d90e8ef31b226a8fe1f8c96 v: v3 --- [refs] | 2 +- trunk/arch/sparc/kernel/leon_pci.c | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/[refs] b/[refs] index e1b2f56e4e90..6a760843259c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c29554f53e4679d30f4eb39cad7700023cbaae67 +refs/heads/master: d657784b70ef653350d7aa49da90a8484c29da7d diff --git a/trunk/arch/sparc/kernel/leon_pci.c b/trunk/arch/sparc/kernel/leon_pci.c index aba6b958b2a5..19f56058742b 100644 --- a/trunk/arch/sparc/kernel/leon_pci.c +++ b/trunk/arch/sparc/kernel/leon_pci.c @@ -45,7 +45,6 @@ void leon_pci_init(struct platform_device *ofdev, struct leon_pci_info *info) void __devinit pcibios_fixup_bus(struct pci_bus *pbus) { - struct leon_pci_info *info = pbus->sysdata; struct pci_dev *dev; int i, has_io, has_mem; u16 cmd; @@ -111,18 +110,6 @@ int pcibios_enable_device(struct pci_dev *dev, int mask) return pci_enable_resources(dev, mask); } -struct device_node *pci_device_to_OF_node(struct pci_dev *pdev) -{ - /* - * Currently the OpenBoot nodes are not connected with the PCI device, - * this is because the LEON PROM does not create PCI nodes. Eventually - * this will change and the same approach as pcic.c can be used to - * match PROM nodes with pci devices. - */ - return NULL; -} -EXPORT_SYMBOL(pci_device_to_OF_node); - void __devinit pcibios_update_irq(struct pci_dev *dev, int irq) { #ifdef CONFIG_PCI_DEBUG