diff options
| author | Tony Luck <tony.luck@intel.com> | 2007-04-30 16:56:17 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-04-30 16:56:17 -0400 |
| commit | d29182534c5f39ff899763d1e0982d8f33791d6f (patch) | |
| tree | 69fd6a52145b22650799493b54e8795e988a89af /include/asm-ia64 | |
| parent | b643b0fdbc59cf6bbb086974b29d2571e9e9f646 (diff) | |
| parent | ddd83eff58888928115b3e225a46d3c686e64594 (diff) | |
Pull mem-attribute into release branch
Diffstat (limited to 'include/asm-ia64')
| -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) | |||
| 421 | 421 | ||
| 422 | extern void __iomem * ioremap(unsigned long offset, unsigned long size); | 422 | extern void __iomem * ioremap(unsigned long offset, unsigned long size); |
| 423 | extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size); | 423 | extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size); |
| 424 | 424 | extern void iounmap (volatile void __iomem *addr); | |
| 425 | static inline void | ||
| 426 | iounmap (volatile void __iomem *addr) | ||
| 427 | { | ||
| 428 | } | ||
| 429 | 425 | ||
| 430 | /* Use normal IO mappings for DMI */ | 426 | /* Use normal IO mappings for DMI */ |
| 431 | #define dmi_ioremap ioremap | 427 | #define dmi_ioremap ioremap |