aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2007-05-15 01:03:31 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2007-05-16 15:35:27 +0100
commite702a7155d14a6e11645e17d829217ae98fd45bb (patch)
tree2eee58ffadeb5dbc5d2a30b6491249e93ebf8e8c
parent06ba255571b0a2f1fb7e49e7406364e4194f4e10 (diff)
[ARM] 4382/1: iop13xx: fix msi support
updates iop13xx msi support for a msi api change in 2.6.22 rev7: * update for Michael Ellerman's "MSI: arch must connect the irq and the msi_desc" patch Signed-off-by: Dan Williams <dan.j.williams@intel.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-iop13xx/msi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-iop13xx/msi.c b/arch/arm/mach-iop13xx/msi.c
index 2d236930222..062d2acdd5e 100644
--- a/arch/arm/mach-iop13xx/msi.c
+++ b/arch/arm/mach-iop13xx/msi.c
@@ -190,5 +190,5 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
write_msi_msg(irq, &msg);
set_irq_chip_and_handler(irq, &iop13xx_msi_chip, handle_simple_irq);
- return irq;
+ return 0;
}