diff options
| author | Tony Luck <tony.luck@intel.com> | 2007-04-30 13:56:17 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-04-30 13:56:17 -0700 |
| commit | d29182534c5f39ff899763d1e0982d8f33791d6f (patch) | |
| tree | 69fd6a52145b22650799493b54e8795e988a89af /include | |
| parent | b643b0fdbc59cf6bbb086974b29d2571e9e9f646 (diff) | |
| parent | ddd83eff58888928115b3e225a46d3c686e64594 (diff) | |
| download | linux-stable-d29182534c5f39ff899763d1e0982d8f33791d6f.tar.gz linux-stable-d29182534c5f39ff899763d1e0982d8f33791d6f.tar.bz2 linux-stable-d29182534c5f39ff899763d1e0982d8f33791d6f.zip | |
Pull mem-attribute into release branch
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-ia64/io.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/asm-ia64/io.h b/include/asm-ia64/io.h index 6311e168cd34..eb17a8692967 100644 --- a/include/asm-ia64/io.h +++ b/include/asm-ia64/io.h @@ -421,11 +421,7 @@ __writeq (unsigned long val, volatile void __iomem *addr) extern void __iomem * ioremap(unsigned long offset, unsigned long size); extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size); - -static inline void -iounmap (volatile void __iomem *addr) -{ -} +extern void iounmap (volatile void __iomem *addr); /* Use normal IO mappings for DMI */ #define dmi_ioremap ioremap |