diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-26 04:25:59 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-26 04:25:59 -0400 |
| commit | 3cf430b0636045dc524759a0852293ba037732a7 (patch) | |
| tree | 2c4e03f9028dc23ab4e6ca5a3a5a263af397984f /include/asm-mn10300 | |
| parent | 93dcf55f828b035fc93fc19eb03c1390e1e6d570 (diff) | |
| parent | 83097aca8567a0bd593534853b71fe0fa9a75d69 (diff) | |
Merge branch 'linus' into sched/devel
Diffstat (limited to 'include/asm-mn10300')
| -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 | } |