aboutsummaryrefslogtreecommitdiff
path: root/arch/m32r/kernel/setup_m32700ut.c
diff options
context:
space:
mode:
authorAl Viro <viro@www.linux.org.uk>2005-08-23 22:47:22 +0100
committerLinus Torvalds <torvalds@g5.osdl.org>2005-08-23 18:43:44 -0700
commitc51d9943b11441fd1ea42c7e70cfb5eed33fe97b (patch)
tree18f2694b421cba1e0160db3781346d577a1e9b5a /arch/m32r/kernel/setup_m32700ut.c
parente231a9c4fdf402bcfd5a7c27be49050882631a95 (diff)
[PATCH] m32r icu_data gcc4 fixes
either icu_data declaration for SMP case should be taken out of m32102.h, or its declarations for m32700ut and opsput should not be static for SMP. Patch does the latter - judging by comments in m32102.h it is intended to be non-static. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/m32r/kernel/setup_m32700ut.c')
-rw-r--r--arch/m32r/kernel/setup_m32700ut.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/m32r/kernel/setup_m32700ut.c b/arch/m32r/kernel/setup_m32700ut.c
index a146b24a556..708634b685e 100644
--- a/arch/m32r/kernel/setup_m32700ut.c
+++ b/arch/m32r/kernel/setup_m32700ut.c
@@ -30,9 +30,11 @@
typedef struct {
unsigned long icucr; /* ICU Control Register */
} icu_data_t;
+static icu_data_t icu_data[M32700UT_NUM_CPU_IRQ];
+#else
+icu_data_t icu_data[M32700UT_NUM_CPU_IRQ];
#endif /* CONFIG_SMP */
-static icu_data_t icu_data[M32700UT_NUM_CPU_IRQ];
static void disable_m32700ut_irq(unsigned int irq)
{