diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /arch/m32r/kernel/setup_mappi3.c | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'arch/m32r/kernel/setup_mappi3.c')
| -rw-r--r-- | arch/m32r/kernel/setup_mappi3.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/m32r/kernel/setup_mappi3.c b/arch/m32r/kernel/setup_mappi3.c index f6ecdf7f555c..d2ff021e2d3d 100644 --- a/arch/m32r/kernel/setup_mappi3.c +++ b/arch/m32r/kernel/setup_mappi3.c | |||
| @@ -19,12 +19,6 @@ | |||
| 19 | 19 | ||
| 20 | #define irq2port(x) (M32R_ICU_CR1_PORTL + ((x - 1) * sizeof(unsigned long))) | 20 | #define irq2port(x) (M32R_ICU_CR1_PORTL + ((x - 1) * sizeof(unsigned long))) |
| 21 | 21 | ||
| 22 | #ifndef CONFIG_SMP | ||
| 23 | typedef struct { | ||
| 24 | unsigned long icucr; /* ICU Control Register */ | ||
| 25 | } icu_data_t; | ||
| 26 | #endif /* CONFIG_SMP */ | ||
| 27 | |||
| 28 | icu_data_t icu_data[NR_IRQS]; | 22 | icu_data_t icu_data[NR_IRQS]; |
| 29 | 23 | ||
| 30 | static void disable_mappi3_irq(unsigned int irq) | 24 | static void disable_mappi3_irq(unsigned int irq) |