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-rbtx4938.c | |
| parent | c2e5df616e1ae6c2a074cb241ebb65a318ebaf7c (diff) | |
| parent | 33d930e59a98fa10a0db9f56c7fa2f21a4aef9b9 (diff) | |
| download | linux-58f2c391cc0560231d7636c39d31b1b26c9396b7.tar.gz linux-58f2c391cc0560231d7636c39d31b1b26c9396b7.tar.xz | |
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-rbtx4938.c')
| -rw-r--r-- | arch/mips/pci/fixup-rbtx4938.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/pci/fixup-rbtx4938.c b/arch/mips/pci/fixup-rbtx4938.c index a80579af609b..ff22a22db73e 100644 --- a/arch/mips/pci/fixup-rbtx4938.c +++ b/arch/mips/pci/fixup-rbtx4938.c @@ -13,7 +13,7 @@ #include <asm/txx9/pci.h> #include <asm/txx9/rbtx4938.h> -int __init rbtx4938_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) +int rbtx4938_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { int irq = tx4938_pcic1_map_irq(dev, slot); |