aboutsummaryrefslogtreecommitdiffstats
path: root/arch/tile/include/asm/pci.h
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2011-11-29 20:42:56 +0200
committerMichael S. Tsirkin <mst@redhat.com>2011-12-04 16:00:10 +0200
commit845501213033d0058945776349f15502823359d8 (patch)
tree549adde58442e159de0d782c48608a98a21bef3a /arch/tile/include/asm/pci.h
parenttile: don't panic on iomap (diff)
downloadlinux-dev-845501213033d0058945776349f15502823359d8.tar.xz
linux-dev-845501213033d0058945776349f15502823359d8.zip
tile: switch to GENERIC_PCI_IOMAP
tile now has working stubs for ioport_map and ioremap such that the generic pci_iomap will DTRT: cast to pointer on memory and return NULL and log message on IO map. Switch it over to GENERIC_PCI_IOMAP. Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Diffstat (limited to 'arch/tile/include/asm/pci.h')
-rw-r--r--arch/tile/include/asm/pci.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/tile/include/asm/pci.h b/arch/tile/include/asm/pci.h
index 7f03cefed1b9..1d25fea42e54 100644
--- a/arch/tile/include/asm/pci.h
+++ b/arch/tile/include/asm/pci.h
@@ -16,6 +16,7 @@
#define _ASM_TILE_PCI_H
#include <linux/pci.h>
+#include <asm-generic/pci_iomap.h>
/*
* Structure of a PCI controller (host bridge)
@@ -49,7 +50,6 @@ struct pci_controller {
int __devinit tile_pci_init(void);
int __devinit pcibios_init(void);
-void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max);
static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) {}
void __devinit pcibios_fixup_bus(struct pci_bus *bus);