diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 15:59:59 -0500 |
| commit | ccf18968b1bbc2fb117190a1984ac2a826dac228 (patch) | |
| tree | 7bc8fbf5722aecf1e84fa50c31c657864cba1daa /arch/m32r/kernel/setup_m32700ut.c | |
| parent | e91c021c487110386a07facd0396e6c3b7cf9c1f (diff) | |
| parent | d99cf9d679a520d67f81d805b7cb91c68e1847f0 (diff) | |
Merge ../torvalds-2.6/
Diffstat (limited to 'arch/m32r/kernel/setup_m32700ut.c')
| -rw-r--r-- | arch/m32r/kernel/setup_m32700ut.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/m32r/kernel/setup_m32700ut.c b/arch/m32r/kernel/setup_m32700ut.c index cb76916b014..fad1fc99bb2 100644 --- a/arch/m32r/kernel/setup_m32700ut.c +++ b/arch/m32r/kernel/setup_m32700ut.c | |||
| @@ -26,15 +26,7 @@ | |||
| 26 | */ | 26 | */ |
| 27 | #define irq2port(x) (M32R_ICU_CR1_PORTL + ((x - 1) * sizeof(unsigned long))) | 27 | #define irq2port(x) (M32R_ICU_CR1_PORTL + ((x - 1) * sizeof(unsigned long))) |
| 28 | 28 | ||
| 29 | #ifndef CONFIG_SMP | ||
| 30 | typedef struct { | ||
| 31 | unsigned long icucr; /* ICU Control Register */ | ||
| 32 | } icu_data_t; | ||
| 33 | static icu_data_t icu_data[M32700UT_NUM_CPU_IRQ]; | ||
| 34 | #else | ||
| 35 | icu_data_t icu_data[M32700UT_NUM_CPU_IRQ]; | 29 | icu_data_t icu_data[M32700UT_NUM_CPU_IRQ]; |
| 36 | #endif /* CONFIG_SMP */ | ||
| 37 | |||
| 38 | 30 | ||
| 39 | static void disable_m32700ut_irq(unsigned int irq) | 31 | static void disable_m32700ut_irq(unsigned int irq) |
| 40 | { | 32 | { |