From 8b8e997fd9d7dff3a00e54480dbe74d31adf5f75 Mon Sep 17 00:00:00 2001 From: "Michael S. Tsirkin" Date: Mon, 30 Jan 2012 00:23:38 +0200 Subject: [PATCH] --- yaml --- r: 287294 b: refs/heads/master c: 0f3b3956c4946a6a991974943e3de33ae3d2523f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/mips/Kconfig | 1 + trunk/arch/mips/lib/iomap-pci.c | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8b47b7a5696e..2fb7e768aac9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b923650b84068b74b6df838aa8f9b2a350171de6 +refs/heads/master: 0f3b3956c4946a6a991974943e3de33ae3d2523f diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig index c4c1312473fb..5ab6e89603c5 100644 --- a/trunk/arch/mips/Kconfig +++ b/trunk/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/trunk/arch/mips/lib/iomap-pci.c b/trunk/arch/mips/lib/iomap-pci.c index 2635b1a96333..fd35daa45314 100644 --- a/trunk/arch/mips/lib/iomap-pci.c +++ b/trunk/arch/mips/lib/iomap-pci.c @@ -10,8 +10,8 @@ #include #include -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;