diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 14:01:25 +0200 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 14:01:25 +0200 |
commit | d7f6884ae0ae6e406ec3500fcde16e8f51642460 (patch) | |
tree | efceb246a4fa12921b7dbd3946a88fa257684405 /arch/m32r/kernel/setup_m32700ut.c | |
parent | [PATCH] sky2: new experimental Marvell Yukon2 driver (diff) | |
parent | Linux 2.6.14-rc1 (diff) | |
download | linux-d7f6884ae0ae6e406ec3500fcde16e8f51642460.tar.xz linux-d7f6884ae0ae6e406ec3500fcde16e8f51642460.zip |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/m32r/kernel/setup_m32700ut.c')
-rw-r--r-- | arch/m32r/kernel/setup_m32700ut.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/m32r/kernel/setup_m32700ut.c b/arch/m32r/kernel/setup_m32700ut.c index a146b24a556b..708634b685e4 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) { |