diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 20:55:21 -0400 |
| commit | bbb20089a3275a19e475dbc21320c3742e3ca423 (patch) | |
| tree | 216fdc1cbef450ca688135c5b8969169482d9a48 /arch/arm/mach-davinci/include/mach/irqs.h | |
| parent | 3e48e656903e9fd8bc805c6a2c4264d7808d315b (diff) | |
| parent | 657a77fa7284d8ae28dfa48f1dc5d919bf5b2843 (diff) | |
Merge branch 'dmaengine' into async-tx-next
Conflicts:
crypto/async_tx/async_xor.c
drivers/dma/ioat/dma_v2.h
drivers/dma/ioat/pci.c
drivers/md/raid5.c
Diffstat (limited to 'arch/arm/mach-davinci/include/mach/irqs.h')
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/irqs.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/include/mach/irqs.h b/arch/arm/mach-davinci/include/mach/irqs.h index 18066074c995..bc5d6aaa69a3 100644 --- a/arch/arm/mach-davinci/include/mach/irqs.h +++ b/arch/arm/mach-davinci/include/mach/irqs.h | |||
| @@ -30,6 +30,9 @@ | |||
| 30 | /* Base address */ | 30 | /* Base address */ |
| 31 | #define DAVINCI_ARM_INTC_BASE 0x01C48000 | 31 | #define DAVINCI_ARM_INTC_BASE 0x01C48000 |
| 32 | 32 | ||
| 33 | #define DAVINCI_INTC_TYPE_AINTC 0 | ||
| 34 | #define DAVINCI_INTC_TYPE_CP_INTC 1 | ||
| 35 | |||
| 33 | /* Interrupt lines */ | 36 | /* Interrupt lines */ |
| 34 | #define IRQ_VDINT0 0 | 37 | #define IRQ_VDINT0 0 |
| 35 | #define IRQ_VDINT1 1 | 38 | #define IRQ_VDINT1 1 |