diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 09:26:17 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-18 09:26:17 -0700 |
commit | 86ea51d4a27ec79e9da7d2ce0c4a58f1dc4544c0 (patch) | |
tree | dadb5d86c9f05bdbfe3180c3b307630c08f721b3 /arch/microblaze/kernel | |
parent | 3b89f56783a4ef796190ef1192c25e72e0b986b6 (diff) | |
parent | 5c79a5ae23e72fa12f1c7c528f62bf3ea35da0dc (diff) | |
download | op-kernel-dev-86ea51d4a27ec79e9da7d2ce0c4a58f1dc4544c0.zip op-kernel-dev-86ea51d4a27ec79e9da7d2ce0c4a58f1dc4544c0.tar.gz |
Merge branch 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6
* 'merge-devicetree' of git://git.secretlab.ca/git/linux-2.6:
spi.h: missing kernel-doc notation, please fix
of: fix missing headers for of_address_to_resource() in MTD and SysACE drivers
of: Fix missing includes
ata: update for of_device to platform_device replacement
microblaze: Fix of: eliminate of_device->node and dev_archdata->{of,prom}_node
microblaze: Fix of/address: Merge all of the bus translation code
booting-without-of: Remove nonexistent chapters from TOC, fix numbering
Diffstat (limited to 'arch/microblaze/kernel')
-rw-r--r-- | arch/microblaze/kernel/prom_parse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/microblaze/kernel/prom_parse.c b/arch/microblaze/kernel/prom_parse.c index d33ba17..99d9b61 100644 --- a/arch/microblaze/kernel/prom_parse.c +++ b/arch/microblaze/kernel/prom_parse.c @@ -73,7 +73,7 @@ int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq) /* We can only get here if we hit a P2P bridge with no node, * let's do standard swizzling and try again */ - lspec = of_irq_pci_swizzle(PCI_SLOT(pdev->devfn), lspec); + lspec = pci_swizzle_interrupt_pin(pdev, lspec); pdev = ppdev; } |