Merge branch 'remotes/lorenzo/pci/pci-iomap'
- Remove useless __KERNEL__ preprocessor guard in sparc io_32.h (Lorenzo
Pieralisi)
- Move ioremap/iounmap declaration so it's visible in asm-generic/io.h
(Lorenzo Pieralisi)
- Fix memory leak in generic !CONFIG_GENERIC_IOMAP pci_iounmap()
implementation (Lorenzo Pieralisi)
* remotes/lorenzo/pci/pci-iomap:
asm-generic/io.h: Fix !CONFIG_GENERIC_IOMAP pci_iounmap() implementation
sparc32: Move ioremap/iounmap declaration before asm-generic/io.h include
sparc32: Remove useless io_32.h __KERNEL__ preprocessor guard