diff options
author | Dan Williams <dan.j.williams@intel.com> | 2007-05-15 01:03:31 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-05-16 15:35:27 +0100 |
commit | e702a7155d14a6e11645e17d829217ae98fd45bb (patch) | |
tree | 2eee58ffadeb5dbc5d2a30b6491249e93ebf8e8c /arch/arm/mach-iop13xx | |
parent | 06ba255571b0a2f1fb7e49e7406364e4194f4e10 (diff) | |
download | linux-e702a7155d14a6e11645e17d829217ae98fd45bb.tar.gz linux-e702a7155d14a6e11645e17d829217ae98fd45bb.tar.bz2 linux-e702a7155d14a6e11645e17d829217ae98fd45bb.zip |
[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>
Diffstat (limited to 'arch/arm/mach-iop13xx')
-rw-r--r-- | arch/arm/mach-iop13xx/msi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-iop13xx/msi.c b/arch/arm/mach-iop13xx/msi.c index 2d2369302220..062d2acdd5e5 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; } |