aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/kernel
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-04 20:11:41 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-05 14:04:40 -0400
commit666e81fdca5486cad644ee3fb64bb7d83e2f3723 (patch)
tree35b830748889a6896a9a07e77529a7de297406db /arch/sh/kernel
parent458fe42529a2510c026afa8fc04f07d2f9d8ab78 (diff)
sections: fix section conflicts in arch/sh
Signed-off-by: Andi Kleen <ak@linux.intel.com> Cc: Paul Mundt <lethal@linux-sh.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/sh/kernel')
-rw-r--r--arch/sh/kernel/ioport.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sh/kernel/ioport.c b/arch/sh/kernel/ioport.c
index e3ad6103e7c..cca14ba84a3 100644
--- a/arch/sh/kernel/ioport.c
+++ b/arch/sh/kernel/ioport.c
@@ -11,7 +11,7 @@
11#include <linux/module.h> 11#include <linux/module.h>
12#include <linux/io.h> 12#include <linux/io.h>
13 13
14const unsigned long sh_io_port_base __read_mostly = -1; 14unsigned long sh_io_port_base __read_mostly = -1;
15EXPORT_SYMBOL(sh_io_port_base); 15EXPORT_SYMBOL(sh_io_port_base);
16 16
17void __iomem *__ioport_map(unsigned long addr, unsigned int size) 17void __iomem *__ioport_map(unsigned long addr, unsigned int size)