diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-01 18:01:43 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-01 18:01:45 +1100 |
| commit | 6eeea3330a7d9af73ccd00430b20cf3ff5b8e6cb (patch) | |
| tree | fc06a923aeeb346dbd03cd4caef316e7c9a47c47 /include/asm-generic/iomap.h | |
| parent | 07921f38d99634543881c1fc3437e4e5fb2df282 (diff) | |
| parent | 4164b9f9a221096a3b030adea4e185252372195c (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'include/asm-generic/iomap.h')
| -rw-r--r-- | include/asm-generic/iomap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/iomap.h b/include/asm-generic/iomap.h index 6afd7d6a9899..1b41011643a5 100644 --- a/include/asm-generic/iomap.h +++ b/include/asm-generic/iomap.h @@ -56,7 +56,7 @@ extern void iowrite8_rep(void __iomem *port, const void *buf, unsigned long coun extern void iowrite16_rep(void __iomem *port, const void *buf, unsigned long count); extern void iowrite32_rep(void __iomem *port, const void *buf, unsigned long count); -#ifdef CONFIG_HAS_IOPORT +#ifdef CONFIG_HAS_IOPORT_MAP /* Create a virtual mapping cookie for an IO port range */ extern void __iomem *ioport_map(unsigned long port, unsigned int nr); extern void ioport_unmap(void __iomem *); |