diff options
Diffstat (limited to 'arch/tile/include/asm')
-rw-r--r-- | arch/tile/include/asm/io.h | 3 | ||||
-rw-r--r-- | arch/tile/include/asm/pci.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/tile/include/asm/io.h b/arch/tile/include/asm/io.h index c9ea1652af0..d2152deb1f3 100644 --- a/arch/tile/include/asm/io.h +++ b/arch/tile/include/asm/io.h | |||
@@ -204,7 +204,8 @@ static inline long ioport_panic(void) | |||
204 | 204 | ||
205 | static inline void __iomem *ioport_map(unsigned long port, unsigned int len) | 205 | static inline void __iomem *ioport_map(unsigned long port, unsigned int len) |
206 | { | 206 | { |
207 | return (void __iomem *) ioport_panic(); | 207 | pr_info("ioport_map: mapping IO resources is unsupported on tile.\n"); |
208 | return NULL; | ||
208 | } | 209 | } |
209 | 210 | ||
210 | static inline void ioport_unmap(void __iomem *addr) | 211 | static inline void ioport_unmap(void __iomem *addr) |
diff --git a/arch/tile/include/asm/pci.h b/arch/tile/include/asm/pci.h index 2a2abc74248..5d5a635530b 100644 --- a/arch/tile/include/asm/pci.h +++ b/arch/tile/include/asm/pci.h | |||
@@ -16,6 +16,7 @@ | |||
16 | #define _ASM_TILE_PCI_H | 16 | #define _ASM_TILE_PCI_H |
17 | 17 | ||
18 | #include <linux/pci.h> | 18 | #include <linux/pci.h> |
19 | #include <asm-generic/pci_iomap.h> | ||
19 | 20 | ||
20 | /* | 21 | /* |
21 | * Structure of a PCI controller (host bridge) | 22 | * Structure of a PCI controller (host bridge) |
@@ -49,7 +50,6 @@ struct pci_controller { | |||
49 | int __devinit tile_pci_init(void); | 50 | int __devinit tile_pci_init(void); |
50 | int __devinit pcibios_init(void); | 51 | int __devinit pcibios_init(void); |
51 | 52 | ||
52 | void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long max); | ||
53 | static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) {} | 53 | static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) {} |
54 | 54 | ||
55 | void __devinit pcibios_fixup_bus(struct pci_bus *bus); | 55 | void __devinit pcibios_fixup_bus(struct pci_bus *bus); |