From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 7 Feb 2012 22:32:24 +0000 (-0800)
Subject: Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=95025d6b27721ae8bbce592403fdc06e982204c8;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'for-linus' of git://git./linux/kernel/git/mst/vhost

arch: fix ioport mapping on mips,sh

Kevin Cernekee reported that recent cleanup that replaced pci_iomap with
a generic function failed to take into account the differences in io
port handling on mips and sh architectures.

Rather than revert the changes reintroducing the code duplication, this
patchset fixes this by adding ability for architectures to override
ioport mapping for pci devices.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost:
  sh: use the the PCI channels's io_map_base
  mips: use the the PCI controller's io_map_base
  lib: add NO_GENERIC_PCI_IOPORT_MAP
---

95025d6b27721ae8bbce592403fdc06e982204c8