diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-10-08 10:20:40 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-10-08 10:20:40 -0700 |
| commit | bc3caae8a191c712d8ae666d0b8d18807bfe2b14 (patch) | |
| tree | 7b338ebba2f1fdbcee3785789bf9f4a74d93aa94 /arch/arm/plat-omap/include/plat/dma.h | |
| parent | 73c5ef126f40b0b872e5964ff65dbe792eeec493 (diff) | |
| parent | 69758ab7a1e2de5636a2188d5357dd03140bf1d8 (diff) | |
| download | talos-obmc-linux-bc3caae8a191c712d8ae666d0b8d18807bfe2b14.tar.gz talos-obmc-linux-bc3caae8a191c712d8ae666d0b8d18807bfe2b14.zip | |
Merge branch 'pm-hwmods' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'arch/arm/plat-omap/include/plat/dma.h')
| -rw-r--r-- | arch/arm/plat-omap/include/plat/dma.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/include/plat/dma.h b/arch/arm/plat-omap/include/plat/dma.h index af3a03941add..098f154f5d41 100644 --- a/arch/arm/plat-omap/include/plat/dma.h +++ b/arch/arm/plat-omap/include/plat/dma.h @@ -319,6 +319,8 @@ #define OMAP34XX_DMA_USIM_TX 79 /* S_DMA_78 */ #define OMAP34XX_DMA_USIM_RX 80 /* S_DMA_79 */ +#define OMAP36XX_DMA_UART4_TX 81 /* S_DMA_80 */ +#define OMAP36XX_DMA_UART4_RX 82 /* S_DMA_81 */ /*----------------------------------------------------------------------------*/ #define OMAP1_DMA_TOUT_IRQ (1 << 0) |
