diff options
author | David S. Miller <davem@davemloft.net> | 2017-09-23 20:16:53 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-09-23 20:16:53 +0300 |
commit | 1f8d31d189cc6ce1e4b972959fda41e790bb92b8 (patch) | |
tree | fd3cca12a29319f073773ac55f7d41cc58e2c73f /arch/mips/pci/pci-tx4939.c | |
parent | 3fb5ec06578e4c85d3486b6a73cbeb07960a51ce (diff) | |
parent | cd4175b11685b11c40e31a03e05084cc212b0649 (diff) | |
download | linux-1f8d31d189cc6ce1e4b972959fda41e790bb92b8.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'arch/mips/pci/pci-tx4939.c')
-rw-r--r-- | arch/mips/pci/pci-tx4939.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/pci/pci-tx4939.c b/arch/mips/pci/pci-tx4939.c index 9d6acc00f348..09a65f7dbe7c 100644 --- a/arch/mips/pci/pci-tx4939.c +++ b/arch/mips/pci/pci-tx4939.c @@ -48,7 +48,7 @@ void __init tx4939_report_pci1clk(void) ((pciclk + 50000) / 100000) % 10); } -int __init tx4939_pcic1_map_irq(const struct pci_dev *dev, u8 slot) +int tx4939_pcic1_map_irq(const struct pci_dev *dev, u8 slot) { if (get_tx4927_pcicptr(dev->bus->sysdata) == tx4939_pcic1ptr) { switch (slot) { @@ -68,7 +68,7 @@ int __init tx4939_pcic1_map_irq(const struct pci_dev *dev, u8 slot) return -1; } -int __init tx4939_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) +int tx4939_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) { int irq = tx4939_pcic1_map_irq(dev, slot); |