diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 12:06:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 12:06:08 -0800 |
| commit | c90c69a508c2fd8d2f892c4b166baffc91111117 (patch) | |
| tree | fbda802935ab4dfc56a7dc758c787fce4c066c02 /arch/sparc64/kernel/pci.c | |
| parent | 6842ac64ae2ed2714004a25d53d3b20f0d3af524 (diff) | |
| parent | 19ba1b19962aeb87a029b37234f54b02e8f7b507 (diff) | |
| download | talos-obmc-linux-c90c69a508c2fd8d2f892c4b166baffc91111117.tar.gz talos-obmc-linux-c90c69a508c2fd8d2f892c4b166baffc91111117.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC] uctrl: Check request_irq() return value.
[SPARC64]: Update defconfig.
[SPARC64] bbc_i2c: Fix kenvctrld eating %100 cpu.
[SPARC64]: Fix arch_teardown_msi_irq().
[SPARC64]: virt_irq_free only needed when CONFIG_PCI_MSI
[SPARC]: Remove the broken SUN_AURORA driver.
Diffstat (limited to 'arch/sparc64/kernel/pci.c')
| -rw-r--r-- | arch/sparc64/kernel/pci.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c index 6b740eb6fe7e..6fedfb98f8b0 100644 --- a/arch/sparc64/kernel/pci.c +++ b/arch/sparc64/kernel/pci.c @@ -668,7 +668,7 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc) void arch_teardown_msi_irq(unsigned int virt_irq) { - struct msi_desc *entry = get_irq_data(virt_irq); + struct msi_desc *entry = get_irq_msi(virt_irq); struct pci_dev *pdev = entry->dev; struct pcidev_cookie *pcp = pdev->sysdata; struct pci_pbm_info *pbm = pcp->pbm; |
