diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-25 14:56:07 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-25 14:56:07 +1000 |
| commit | ea0763a7e62f60f3e166327268a80f16ad806718 (patch) | |
| tree | de54ec5e5d5a49b3cba81b096b7572852aa6f5a9 /arch/powerpc/kernel/prom_parse.c | |
| parent | 271c511db9d37d6797745adb1f151a8bd2838c6f (diff) | |
| parent | c85c41ad73c6db4cf4cc98c595cc5e2fdbdb53d5 (diff) | |
| download | blackbird-op-linux-ea0763a7e62f60f3e166327268a80f16ad806718.tar.gz blackbird-op-linux-ea0763a7e62f60f3e166327268a80f16ad806718.zip | |
Merge branch 'merge'
Diffstat (limited to 'arch/powerpc/kernel/prom_parse.c')
| -rw-r--r-- | arch/powerpc/kernel/prom_parse.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c index 59f69d34cb67..603203276ef6 100644 --- a/arch/powerpc/kernel/prom_parse.c +++ b/arch/powerpc/kernel/prom_parse.c @@ -601,11 +601,6 @@ static struct device_node *of_irq_find_parent(struct device_node *child) return p; } -static u8 of_irq_pci_swizzle(u8 slot, u8 pin) -{ - return (((pin - 1) + slot) % 4) + 1; -} - /* This doesn't need to be called if you don't have any special workaround * flags to pass */ @@ -895,6 +890,12 @@ int of_irq_map_one(struct device_node *device, int index, struct of_irq *out_irq } EXPORT_SYMBOL_GPL(of_irq_map_one); +#ifdef CONFIG_PCI +static u8 of_irq_pci_swizzle(u8 slot, u8 pin) +{ + return (((pin - 1) + slot) % 4) + 1; +} + int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq) { struct device_node *dn, *ppnode; @@ -971,4 +972,4 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq) return of_irq_map_raw(ppnode, &lspec, laddr, out_irq); } EXPORT_SYMBOL_GPL(of_irq_map_pci); - +#endif /* CONFIG_PCI */ |
