diff options
| author |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-16 09:22:22 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-10-16 09:22:22 +0200 |
| commit | 58f2c391cc0560231d7636c39d31b1b26c9396b7 (patch) | |
| tree | 67956eea736a8763f67be8a52bcaf0d3fe4374f4 /arch/mips/pci/fixup-fuloong2e.c | |
| parent | vmbus: add per-channel sysfs info (diff) | |
| parent | Linux 4.14-rc5 (diff) | |
| download | linux-dev-58f2c391cc0560231d7636c39d31b1b26c9396b7.tar.xz linux-dev-58f2c391cc0560231d7636c39d31b1b26c9396b7.zip | |
Merge 4.14-rc5 into char-misc-next
We need the fixes in here to resolve merge issues and for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/mips/pci/fixup-fuloong2e.c')
| -rw-r--r-- | arch/mips/pci/fixup-fuloong2e.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/fixup-fuloong2e.c b/arch/mips/pci/fixup-fuloong2e.c index 50da773faede..b47c2771dc99 100644 --- a/arch/mips/pci/fixup-fuloong2e.c +++ b/arch/mips/pci/fixup-fuloong2e.c @@ -19,7 +19,7 @@ /* South bridge slot number is set by the pci probe process */ static u8 sb_slot = 5; -int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) +int pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { int irq = 0; |