aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sparc/kernel/pcic.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sparc/kernel/pcic.c')
-rw-r--r--arch/sparc/kernel/pcic.c16
1 files changed, 11 insertions, 5 deletions
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 207f1b6eef53..5ca7e8f42bd9 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -37,8 +37,6 @@
37#include <asm/irq_regs.h> 37#include <asm/irq_regs.h>
38 38
39 39
40unsigned int pcic_pin_to_irq(unsigned int pin, char *name);
41
42/* 40/*
43 * I studied different documents and many live PROMs both from 2.30 41 * I studied different documents and many live PROMs both from 2.30
44 * family and 3.xx versions. I came to the amazing conclusion: there is 42 * family and 3.xx versions. I came to the amazing conclusion: there is
@@ -601,7 +599,7 @@ pcic_fill_irq(struct linux_pcic *pcic, struct pci_dev *dev, int node)
601/* 599/*
602 * Normally called from {do_}pci_scan_bus... 600 * Normally called from {do_}pci_scan_bus...
603 */ 601 */
604void __init pcibios_fixup_bus(struct pci_bus *bus) 602void __devinit pcibios_fixup_bus(struct pci_bus *bus)
605{ 603{
606 struct pci_dev *dev; 604 struct pci_dev *dev;
607 int i, has_io, has_mem; 605 int i, has_io, has_mem;
@@ -681,7 +679,7 @@ void __init pcibios_fixup_bus(struct pci_bus *bus)
681 * pcic_pin_to_irq() is exported to ebus.c. 679 * pcic_pin_to_irq() is exported to ebus.c.
682 */ 680 */
683unsigned int 681unsigned int
684pcic_pin_to_irq(unsigned int pin, char *name) 682pcic_pin_to_irq(unsigned int pin, const char *name)
685{ 683{
686 struct linux_pcic *pcic = &pcic0; 684 struct linux_pcic *pcic = &pcic0;
687 unsigned int irq; 685 unsigned int irq;
@@ -842,7 +840,7 @@ static void watchdog_reset() {
842/* 840/*
843 * Other archs parse arguments here. 841 * Other archs parse arguments here.
844 */ 842 */
845char * __init pcibios_setup(char *str) 843char * __devinit pcibios_setup(char *str)
846{ 844{
847 return str; 845 return str;
848} 846}
@@ -944,6 +942,14 @@ int pcibios_assign_resource(struct pci_dev *pdev, int resource)
944 return -ENXIO; 942 return -ENXIO;
945} 943}
946 944
945struct device_node *pci_device_to_OF_node(struct pci_dev *pdev)
946{
947 struct pcidev_cookie *pc = pdev->sysdata;
948
949 return pc->prom_node;
950}
951EXPORT_SYMBOL(pci_device_to_OF_node);
952
947/* 953/*
948 * This probably belongs here rather than ioport.c because 954 * This probably belongs here rather than ioport.c because
949 * we do not want this crud linked into SBus kernels. 955 * we do not want this crud linked into SBus kernels.