projects
/
platform
/
adaptation
/
renesas_rcar
/
renesas_kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip
[platform/adaptation/renesas_rcar/renesas_kernel.git]
/
arch
/
sh
/
include
/
asm
/
io_trapped.h
diff --git
a/arch/sh/include/asm/io_trapped.h
b/arch/sh/include/asm/io_trapped.h
index
f1251d4
..
4ab94ef
100644
(file)
--- a/
arch/sh/include/asm/io_trapped.h
+++ b/
arch/sh/include/asm/io_trapped.h
@@
-36,7
+36,7
@@
__ioremap_trapped(unsigned long offset, unsigned long size)
#define __ioremap_trapped(offset, size) NULL
#endif
-#ifdef CONFIG_HAS_IOPORT
+#ifdef CONFIG_HAS_IOPORT
_MAP
extern struct list_head trapped_io;
static inline void __iomem *