diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:03:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-08-24 01:03:34 -0400 |
| commit | 75a95178dafb5c8d69b4abe45ea746a9cea23142 (patch) | |
| tree | 1dbf80c83d9521dcdebc9e670f48da6c1ba34187 /arch/m32r/kernel/setup_opsput.c | |
| parent | 8531c5ffbca65f6df868637c26e6df6f88bff738 (diff) | |
| parent | 0572e3da3ff5c3744b2f606ecf296d5f89a4bbdf (diff) | |
Merge upstream into 'upstream' branch of netdev-2.6.git.
Hand fix merge conflict in drivers/net/tokenring/Kconfig.
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 | { |