From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 19 Jan 2010 17:45:05 +0000 (+0900)
Subject: sh: Shut up noisy IOREMAP_FIXED=n build.
X-Git-Tag: v2.6.34-rc1~285^2~92
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=70911b861bfbba1851cbb3497635030f34703c7a;p=karo-tx-linux.git

sh: Shut up noisy IOREMAP_FIXED=n build.

The ioremap_fixed() stub neglected to provide a return value, resulting
in a fairly noisy build.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
---

diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index 4bad72a1b39e..e4f563f472eb 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -245,10 +245,11 @@ extern int iounmap_fixed(void __iomem *);
 extern void ioremap_fixed_init(void);
 #else
 static inline void __iomem *
-ioremap_fixed(resource_size t phys_addr, unsigned long offset,
+ioremap_fixed(resource_size_t phys_addr, unsigned long offset,
 	      unsigned long size, pgprot_t prot)
 {
 	BUG();
+	return NULL;
 }
 
 static inline void ioremap_fixed_init(void) { }