diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-03-21 17:46:19 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-03-21 17:46:19 +1100 |
| commit | 9f443c47565566c011ea8210b28eccaf3e642f84 (patch) | |
| tree | 967bf58986cf99cffc19e49ebd3f8aee3d56e315 /include/linux/io.h | |
| parent | 75226119c77abf98a79815e8eac2ba1433dcad9d (diff) | |
| parent | 9dd3774eed431b69074f0c88ed8321a9497970c6 (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'include/linux/io.h')
| -rw-r--r-- | include/linux/io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/io.h b/include/linux/io.h index 8a18e75600cc..b76e6e545806 100644 --- a/include/linux/io.h +++ b/include/linux/io.h @@ -41,7 +41,7 @@ static inline int ioremap_page_range(unsigned long addr, unsigned long end, /* * Managed iomap interface */ -#ifdef CONFIG_HAS_IOPORT +#ifdef CONFIG_HAS_IOPORT_MAP void __iomem * devm_ioport_map(struct device *dev, unsigned long port, unsigned int nr); void devm_ioport_unmap(struct device *dev, void __iomem *addr); |