From eab04193a0d068aff5d34ba7a72e9e1cafee6f9a Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 14 Dec 2009 14:55:45 +0900 Subject: [PATCH] --- yaml --- r: 177026 b: refs/heads/master c: 0eb37e26ed332b2a96630cf7f7ebe9fddb41cc3c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/sh/include/asm/io.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7c115312333d..113591666dca 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf3cdeda901c7f42de3cddc8c5aa19f6b8d8f9df +refs/heads/master: 0eb37e26ed332b2a96630cf7f7ebe9fddb41cc3c diff --git a/trunk/arch/sh/include/asm/io.h b/trunk/arch/sh/include/asm/io.h index 988c1be58e51..026dd659a640 100644 --- a/trunk/arch/sh/include/asm/io.h +++ b/trunk/arch/sh/include/asm/io.h @@ -277,6 +277,7 @@ __ioremap_mode(unsigned long offset, unsigned long size, unsigned long flags) return __ioremap(offset, size, flags); } #else +#define __ioremap(offset, size, flags) ((void __iomem *)(offset)) #define __ioremap_mode(offset, size, flags) ((void __iomem *)(offset)) #define __iounmap(addr) do { } while (0) #endif /* CONFIG_MMU */