summaryrefslogtreecommitdiffstats
path: root/arch/frv/kernel
diff options
context:
space:
mode:
authorAndi Kleen <ak@linux.intel.com>2012-10-04 17:11:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-06 03:04:38 +0900
commit3f3247d01933d357229f6a11f62d88a848445a9a (patch)
treeffb820de7527e5d37714d6a57cf5faa10c38808c /arch/frv/kernel
parentbcad6dc3634a861c8c5e1f7261c02646a9010014 (diff)
downloadop-kernel-dev-3f3247d01933d357229f6a11f62d88a848445a9a.zip
op-kernel-dev-3f3247d01933d357229f6a11f62d88a848445a9a.tar.gz
sections: fix section conflicts in arch/frv
Signed-off-by: Andi Kleen <ak@linux.intel.com> Cc: David Howells <dhowells@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/frv/kernel')
-rw-r--r--arch/frv/kernel/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/kernel/setup.c b/arch/frv/kernel/setup.c
index 75cf7f4..1f1e5ef 100644
--- a/arch/frv/kernel/setup.c
+++ b/arch/frv/kernel/setup.c
@@ -184,7 +184,7 @@ static struct clock_cmode __pminitdata clock_cmodes_fr555[16] = {
[6] = { _x1, _x1_5, _x1_5, _x4_5, _x0_375 },
};
-static const struct clock_cmode __pminitdata *clock_cmodes;
+static const struct clock_cmode __pminitconst *clock_cmodes;
static int __pminitdata clock_doubled;
static struct uart_port __pminitdata __frv_uart0 = {
OpenPOWER on IntegriCloud