diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 22:38:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-03-18 22:38:20 +0100 |
| commit | c592c761a36286ab83451daa37a21c8558ea99c0 (patch) | |
| tree | 8abf57708fabf2a915320e9515b1ae2730ebf499 /arch/mips/lib/iomap-pci.c | |
| parent | Merge remote-tracking branch 'regulator/topic/drivers' into regulator-next (diff) | |
| parent | ARM i.MX 3ds debugboard: register a dummy regulator for the smsc911x device (diff) | |
| download | linux-c592c761a36286ab83451daa37a21c8558ea99c0.tar.xz linux-c592c761a36286ab83451daa37a21c8558ea99c0.zip | |
Merge remote-tracking branch 'regulator/topic/stub' into regulator-next
Diffstat (limited to 'arch/mips/lib/iomap-pci.c')
| -rw-r--r-- | arch/mips/lib/iomap-pci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/lib/iomap-pci.c b/arch/mips/lib/iomap-pci.c index 2635b1a96333..fd35daa45314 100644 --- a/arch/mips/lib/iomap-pci.c +++ b/arch/mips/lib/iomap-pci.c @@ -10,8 +10,8 @@ #include <linux/module.h> #include <asm/io.h> -static void __iomem *ioport_map_pci(struct pci_dev *dev, - unsigned long port, unsigned int nr) +void __iomem *__pci_ioport_map(struct pci_dev *dev, + unsigned long port, unsigned int nr) { struct pci_controller *ctrl = dev->bus->sysdata; unsigned long base = ctrl->io_map_base; |