diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-03-02 06:59:16 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-03-02 07:04:16 -0500 |
| commit | 6139dbbb7769c7251e04813f577454c6c9293e15 (patch) | |
| tree | 588b44b4b8929caf812d440ec371331658fd7da3 /arch/arm/mach-omap1/irq.c | |
| parent | 9623b3732d11b0a18d9af3419f680d27ea24b014 (diff) | |
| parent | 1f4d1774133f596a3c4f520859890ad93769e523 (diff) | |
Merge branch 'omap-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
Diffstat (limited to 'arch/arm/mach-omap1/irq.c')
| -rw-r--r-- | arch/arm/mach-omap1/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c index 6383a12ad970..410d3e78dd0f 100644 --- a/arch/arm/mach-omap1/irq.c +++ b/arch/arm/mach-omap1/irq.c | |||
| @@ -238,7 +238,7 @@ void __init omap_init_irq(void) | |||
| 238 | 238 | ||
| 239 | if (cpu_is_omap730()) | 239 | if (cpu_is_omap730()) |
| 240 | omap_unmask_irq(INT_730_IH2_IRQ); | 240 | omap_unmask_irq(INT_730_IH2_IRQ); |
| 241 | else if (cpu_is_omap1510()) | 241 | else if (cpu_is_omap15xx()) |
| 242 | omap_unmask_irq(INT_1510_IH2_IRQ); | 242 | omap_unmask_irq(INT_1510_IH2_IRQ); |
| 243 | else if (cpu_is_omap16xx()) | 243 | else if (cpu_is_omap16xx()) |
| 244 | omap_unmask_irq(INT_1610_IH2_IRQ); | 244 | omap_unmask_irq(INT_1610_IH2_IRQ); |