diff options
author | Jonas Bonn <jonas@southpole.se> | 2011-07-02 17:23:29 +0200 |
---|---|---|
committer | Jonas Bonn <jonas@southpole.se> | 2011-07-22 18:46:26 +0200 |
commit | 82ed223c264def2b15ee4bec2e8c3048092ceb5f (patch) | |
tree | 5db30cfb6bb60ce5914128ebe342f08257688aac /include/asm-generic/io.h | |
parent | f1ecc69838a2d7c8a3e1909f637d4083c071777d (diff) | |
download | linux-stable-82ed223c264def2b15ee4bec2e8c3048092ceb5f.tar.gz linux-stable-82ed223c264def2b15ee4bec2e8c3048092ceb5f.tar.bz2 linux-stable-82ed223c264def2b15ee4bec2e8c3048092ceb5f.zip |
iomap: make IOPORT/PCI mapping functions conditional
Use the CONFIG_HAS_IOPORT and CONFIG_PCI options to decide whether or
not functions for mapping these areas are provided.
Signed-off-by: Jonas Bonn <jonas@southpole.se>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/asm-generic/io.h')
-rw-r--r-- | include/asm-generic/io.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-generic/io.h b/include/asm-generic/io.h index a1caf2d25d82..912088773a69 100644 --- a/include/asm-generic/io.h +++ b/include/asm-generic/io.h @@ -332,6 +332,7 @@ static inline void iounmap(void *addr) } #endif /* CONFIG_MMU */ +#ifdef CONFIG_HAS_IOPORT #ifndef CONFIG_GENERIC_IOMAP static inline void __iomem *ioport_map(unsigned long port, unsigned int nr) { @@ -345,6 +346,7 @@ static inline void ioport_unmap(void __iomem *p) extern void __iomem *ioport_map(unsigned long port, unsigned int nr); extern void ioport_unmap(void __iomem *p); #endif /* CONFIG_GENERIC_IOMAP */ +#endif /* CONFIG_HAS_IOPORT */ #define xlate_dev_kmem_ptr(p) p #define xlate_dev_mem_ptr(p) __va(p) |