Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 33469
b: refs/heads/master
c: d55c4a7
h: refs/heads/master
i:
  33467: 76971fe
v: v3
  • Loading branch information
Li Yang authored and Paul Mackerras committed Aug 23, 2006
1 parent 93044b8 commit 0b45442
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 87589f08beaec3e1f8a3af0c72406c845f706821
refs/heads/master: d55c4a76f26160482158cd43788dcfc96a320a4f
13 changes: 7 additions & 6 deletions trunk/arch/powerpc/kernel/prom_parse.c
Original file line number Diff line number Diff line change
Expand Up @@ -598,11 +598,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
*/
Expand Down Expand Up @@ -891,6 +886,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;
Expand Down Expand Up @@ -967,4 +968,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 */

0 comments on commit 0b45442

Please sign in to comment.