summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-09 12:00:22 +0000
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-02-09 12:00:22 +0000
commita08a499aa3d85b605b5669cfc82b8e14232f7e91 (patch)
treefd82da95552c996e9522a068ec77eae3a5ac6eec /arch/mips
parent6d70934a0248d0d92e01116807c02c00ae172299 (diff)
parentd65b4e98d7ea3038b767b70fe8be959b2913f16d (diff)
Merge tag 'v3.3-rc3' as we've got several bugfixes in there which are
colliding annoyingly with development. Linux 3.3-rc3 .. the number of the half-beast? Conflicts: sound/soc/codecs/wm5100.c sound/soc/codecs/wm8994.c
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/Kconfig1
-rw-r--r--arch/mips/lib/iomap-pci.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index c4c1312473f..5ab6e89603c 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -2356,6 +2356,7 @@ config PCI
depends on HW_HAS_PCI
select PCI_DOMAINS
select GENERIC_PCI_IOMAP
+ select NO_GENERIC_PCI_IOPORT_MAP
help
Find out whether you have a PCI motherboard. PCI is the name of a
bus system, i.e. the way the CPU talks to the other stuff inside
diff --git a/arch/mips/lib/iomap-pci.c b/arch/mips/lib/iomap-pci.c
index 2635b1a9633..fd35daa4531 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;