diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-01-13 02:37:24 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-01-13 02:37:24 -0500 |
| commit | 6db9a0f326d3144d790d9479309df480a8f562e4 (patch) | |
| tree | 650a8950c35c087278ecee1b8d123f75f601ebc8 /arch/arm/mach-s5pv310/include/mach/irqs.h | |
| parent | c400c9e23feb5bb3fbe8a8d4581ecce3b19a2f38 (diff) | |
| parent | 18b022eb117e7f70c191267551ff865f278a9258 (diff) | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'arch/arm/mach-s5pv310/include/mach/irqs.h')
| -rw-r--r-- | arch/arm/mach-s5pv310/include/mach/irqs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-s5pv310/include/mach/irqs.h b/arch/arm/mach-s5pv310/include/mach/irqs.h index 99e7dad8a85a..3c05c58b5392 100644 --- a/arch/arm/mach-s5pv310/include/mach/irqs.h +++ b/arch/arm/mach-s5pv310/include/mach/irqs.h | |||
| @@ -54,6 +54,9 @@ | |||
| 54 | #define COMBINER_GROUP(x) ((x) * MAX_IRQ_IN_COMBINER + IRQ_SPI(64)) | 54 | #define COMBINER_GROUP(x) ((x) * MAX_IRQ_IN_COMBINER + IRQ_SPI(64)) |
| 55 | #define COMBINER_IRQ(x, y) (COMBINER_GROUP(x) + y) | 55 | #define COMBINER_IRQ(x, y) (COMBINER_GROUP(x) + y) |
| 56 | 56 | ||
| 57 | #define IRQ_PDMA0 COMBINER_IRQ(21, 0) | ||
| 58 | #define IRQ_PDMA1 COMBINER_IRQ(21, 1) | ||
| 59 | |||
| 57 | #define IRQ_TIMER0_VIC COMBINER_IRQ(22, 0) | 60 | #define IRQ_TIMER0_VIC COMBINER_IRQ(22, 0) |
| 58 | #define IRQ_TIMER1_VIC COMBINER_IRQ(22, 1) | 61 | #define IRQ_TIMER1_VIC COMBINER_IRQ(22, 1) |
| 59 | #define IRQ_TIMER2_VIC COMBINER_IRQ(22, 2) | 62 | #define IRQ_TIMER2_VIC COMBINER_IRQ(22, 2) |