diff options
| author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-27 08:30:07 -0400 |
| commit | efda9452046bdd707b23a85b7846ec33548f84f1 (patch) | |
| tree | f08c915049ea1829ba115cd41a0ba28ddf184e07 /arch/m32r/kernel/setup_opsput.c | |
| parent | b01f2cc1c37ac3d5ca313c90370a586dffe5aca9 (diff) | |
| parent | 36676bcbf9f6bcbea9d06e67ee8d04eacde54952 (diff) | |
Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'arch/m32r/kernel/setup_opsput.c')
| -rw-r--r-- | arch/m32r/kernel/setup_opsput.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/m32r/kernel/setup_opsput.c b/arch/m32r/kernel/setup_opsput.c index f0301f58bcce..d7b7ec6d30f8 100644 --- a/arch/m32r/kernel/setup_opsput.c +++ b/arch/m32r/kernel/setup_opsput.c | |||
| @@ -31,9 +31,11 @@ | |||
| 31 | typedef struct { | 31 | typedef struct { |
| 32 | unsigned long icucr; /* ICU Control Register */ | 32 | unsigned long icucr; /* ICU Control Register */ |
| 33 | } icu_data_t; | 33 | } icu_data_t; |
| 34 | static icu_data_t icu_data[OPSPUT_NUM_CPU_IRQ]; | ||
| 35 | #else | ||
| 36 | icu_data_t icu_data[OPSPUT_NUM_CPU_IRQ]; | ||
| 34 | #endif /* CONFIG_SMP */ | 37 | #endif /* CONFIG_SMP */ |
| 35 | 38 | ||
| 36 | static icu_data_t icu_data[OPSPUT_NUM_CPU_IRQ]; | ||
| 37 | 39 | ||
| 38 | static void disable_opsput_irq(unsigned int irq) | 40 | static void disable_opsput_irq(unsigned int irq) |
| 39 | { | 41 | { |