summaryrefslogtreecommitdiff
path: root/drivers/parisc
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@HansenPartnership.com>2012-01-30 20:40:47 +0400
committerJames Bottomley <JBottomley@Parallels.com>2012-02-27 19:43:30 +0400
commit97a29d59fc222b36bac3ee3a8ae994f65bf7ffdf (patch)
treefdfe0aa6e408bbec38e33e49703a284eeaf7931d /drivers/parisc
parent500dd2370e77c9551ba298bdeeb91b02d8402199 (diff)
downloadlinux-97a29d59fc222b36bac3ee3a8ae994f65bf7ffdf.tar.xz
[PARISC] fix compile break caused by iomap: make IOPORT/PCI mapping functions conditional
The problem in commit fea80311a939a746533a6d7e7c3183729d6a3faf Author: Randy Dunlap <rdunlap@xenotime.net> Date: Sun Jul 24 11:39:14 2011 -0700 iomap: make IOPORT/PCI mapping functions conditional is that if your architecture supplies pci_iomap/pci_iounmap, it expects always to supply them. Adding empty body defitions in the !CONFIG_PCI case, which is what this patch does, breaks the parisc compile because the functions become doubly defined. It took us a while to spot this, because we don't actually build !CONFIG_PCI very often (only if someone is brave enough to test the snake/asp machines). Since the note in the commit log says this is to fix a CONFIG_GENERIC_IOMAP issue (which it does because CONFIG_GENERIC_IOMAP supplies pci_iounmap only if CONFIG_PCI is set), there should actually have been a condition upon this. This should make sure no other architecture's !CONFIG_PCI compile breaks in the same way as parisc. The fix had to be updated to take account of the GENERIC_PCI_IOMAP separation. Reported-by: Rolf Eike Beer <eike@sf-mail.de> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/parisc')
0 files changed, 0 insertions, 0 deletions