diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2019-01-25 20:10:15 +0000 |
|---|---|---|
| committer |   Arnd Bergmann <arnd@arndb.de> | 2019-01-30 11:34:42 +0100 |
| commit | db4090920ba2d61a5827a23e441447926a02ffee (patch) | |
| tree | bcb419536d686dcddac79bf4175dbd16cbe662a6 /arch/arm/mach-iop32x | |
| parent | Merge tag 'omap-for-v5.0/fixes-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/fixes (diff) | |
| download | linux-dev-db4090920ba2d61a5827a23e441447926a02ffee.tar.xz linux-dev-db4090920ba2d61a5827a23e441447926a02ffee.zip | |
ARM: iop32x/n2100: fix PCI IRQ mapping
Booting 4.20 on a TheCUS N2100 results in a kernel oops while probing
PCI, due to n2100_pci_map_irq() having been discarded during boot.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Cc: stable@vger.kernel.org # 2.6.18+
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-iop32x')
| -rw-r--r-- | arch/arm/mach-iop32x/n2100.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-iop32x/n2100.c b/arch/arm/mach-iop32x/n2100.c index 3b73813c6b04..23e8c93515d4 100644 --- a/arch/arm/mach-iop32x/n2100.c +++ b/arch/arm/mach-iop32x/n2100.c @@ -75,8 +75,7 @@ void __init n2100_map_io(void) /* * N2100 PCI. */ -static int __init -n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) +static int n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { int irq; |