diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-12-10 12:44:39 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-12-10 12:44:39 -0500 |
| commit | 67b738ef32df7ec429004866d2a739a3775894d2 (patch) | |
| tree | 5c67fa0cea6cc7298321480eda2df04bef795305 /arch/arm/plat-omap/include | |
| parent | c451278c2864e253a4bb303b596a29edc3bb527c (diff) | |
| parent | 5d190c40100793a6dfc37bf325677c10f3c80edf (diff) | |
Merge branch 'devel-omap-irq' into omap-for-linus
Diffstat (limited to 'arch/arm/plat-omap/include')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/irqs.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/include/plat/irqs.h b/arch/arm/plat-omap/include/plat/irqs.h index 65e20a686713..2910de921c52 100644 --- a/arch/arm/plat-omap/include/plat/irqs.h +++ b/arch/arm/plat-omap/include/plat/irqs.h | |||
| @@ -77,7 +77,7 @@ | |||
| 77 | /* | 77 | /* |
| 78 | * OMAP-1610 specific IRQ numbers for interrupt handler 1 | 78 | * OMAP-1610 specific IRQ numbers for interrupt handler 1 |
| 79 | */ | 79 | */ |
| 80 | #define INT_1610_IH2_IRQ 0 | 80 | #define INT_1610_IH2_IRQ INT_1510_IH2_IRQ |
| 81 | #define INT_1610_IH2_FIQ 2 | 81 | #define INT_1610_IH2_FIQ 2 |
| 82 | #define INT_1610_McBSP2_TX 4 | 82 | #define INT_1610_McBSP2_TX 4 |
| 83 | #define INT_1610_McBSP2_RX 5 | 83 | #define INT_1610_McBSP2_RX 5 |