From 59eb252bd5875a31c53b4dd1644d6a795ad988a7 Mon Sep 17 00:00:00 2001 From: Paul Mundt Date: Mon, 18 Jan 2010 21:20:13 +0900 Subject: [PATCH] --- yaml --- r: 181105 b: refs/heads/master c: edf711b66f2a8a9629aa253ad8b3a5a03b5d7af5 h: refs/heads/master i: 181103: 15a9caf2fd23f7a6b3dd16952b0d0999faaf718b v: v3 --- [refs] | 2 +- trunk/arch/sh/include/asm/io.h | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2d69999a5314..dd4a174507f3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9b9487af79955a8e8fcddc963f56697e020cfed +refs/heads/master: edf711b66f2a8a9629aa253ad8b3a5a03b5d7af5 diff --git a/trunk/arch/sh/include/asm/io.h b/trunk/arch/sh/include/asm/io.h index bee5965e0a82..9aa9438c66c3 100644 --- a/trunk/arch/sh/include/asm/io.h +++ b/trunk/arch/sh/include/asm/io.h @@ -241,6 +241,15 @@ void __iounmap(void __iomem *addr); extern void __iomem *ioremap_fixed(resource_size_t, unsigned long, pgprot_t); extern void iounmap_fixed(void __iomem *); extern void ioremap_fixed_init(void); +#else +static inline void __iomem * +ioremap_fixed(resource_size t phys_addr, unsigned long size, pgprot_t prot) +{ + BUG(); +} + +static inline void ioremap_fixed_init(void) { } +static inline void iounmap_fixed(void __iomem *addr) { } #endif static inline void __iomem *