diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-28 10:53:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-10-28 10:53:24 -0700 |
| commit | 22450e03acf18ef0dbdbbc155f0f97f105bf6878 (patch) | |
| tree | 5b67531dcd3d7a1f355c1a1630345a2925c5679c /arch/alpha/kernel/sys_nautilus.c | |
| parent | b35f0ca74f055cc322fcbc6ec8c31cfb8dad892f (diff) | |
| parent | 814eae5982cc55988f642f7f1d10eaf340845c00 (diff) | |
Merge tag 'pci-v4.14-fixes-6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci
Pull PCI fix from Bjorn Helgaas:
"Move alpha PCI IRQ map/swizzle functions out of initdata to fix
regression from PCI core IRQ mapping changes (Lorenzo Pieralisi)"
* tag 'pci-v4.14-fixes-6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
alpha/PCI: Move pci_map_irq()/pci_swizzle() out of initdata
Diffstat (limited to 'arch/alpha/kernel/sys_nautilus.c')
| -rw-r--r-- | arch/alpha/kernel/sys_nautilus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_nautilus.c b/arch/alpha/kernel/sys_nautilus.c index 8ae04a121186..d019e4ce07bd 100644 --- a/arch/alpha/kernel/sys_nautilus.c +++ b/arch/alpha/kernel/sys_nautilus.c @@ -62,7 +62,7 @@ nautilus_init_irq(void) common_init_isa_dma(); } -static int __init +static int nautilus_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { /* Preserve the IRQ set up by the console. */ |