diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 05:32:52 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 05:32:52 -0400 |
| commit | e92b4fdacc6a7d8cc7895b81347671d5fcd6c5e1 (patch) | |
| tree | 4f84567261682d8ec2ad4102bce1ff970a6eed1a /include/asm-mn10300/io.h | |
| parent | 9fcaff0e660d886e9a766460adbe558dd25de31b (diff) | |
| parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) | |
Merge commit 'v2.6.27-rc6' into x86/iommu
Diffstat (limited to 'include/asm-mn10300/io.h')
| -rw-r--r-- | include/asm-mn10300/io.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-mn10300/io.h b/include/asm-mn10300/io.h index b8b6dc878250..c1a4119e6497 100644 --- a/include/asm-mn10300/io.h +++ b/include/asm-mn10300/io.h | |||
| @@ -259,6 +259,8 @@ static inline void *ioremap_nocache(unsigned long offset, unsigned long size) | |||
| 259 | return (void *) (offset | 0x20000000); | 259 | return (void *) (offset | 0x20000000); |
| 260 | } | 260 | } |
| 261 | 261 | ||
| 262 | #define ioremap_wc ioremap_nocache | ||
| 263 | |||
| 262 | static inline void iounmap(void *addr) | 264 | static inline void iounmap(void *addr) |
| 263 | { | 265 | { |
| 264 | } | 266 | } |