diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-15 22:06:08 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-15 22:06:08 +0100 |
| commit | 0a3abcf75bf391fec4e32356ab5ddb8f5d2e6b41 (patch) | |
| tree | b80b1d344ec24cad28b057ef803cebac9434be01 /include/asm-blackfin/mach-bf548/dma.h | |
| parent | [CIFS] factoring out common code in get_inode_info functions (diff) | |
| parent | Linux 2.6.25-rc2 (diff) | |
| download | linux-0a3abcf75bf391fec4e32356ab5ddb8f5d2e6b41.tar.xz linux-0a3abcf75bf391fec4e32356ab5ddb8f5d2e6b41.zip | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-blackfin/mach-bf548/dma.h')
| -rw-r--r-- | include/asm-blackfin/mach-bf548/dma.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-blackfin/mach-bf548/dma.h b/include/asm-blackfin/mach-bf548/dma.h index 4d97d3aa97cd..46ff31f20ae5 100644 --- a/include/asm-blackfin/mach-bf548/dma.h +++ b/include/asm-blackfin/mach-bf548/dma.h @@ -51,9 +51,13 @@ #define CH_PIXC_OVERLAY 16 #define CH_PIXC_OUTPUT 17 #define CH_SPORT2_RX 18 +#define CH_UART2_RX 18 #define CH_SPORT2_TX 19 +#define CH_UART2_TX 19 #define CH_SPORT3_RX 20 +#define CH_UART3_RX 20 #define CH_SPORT3_TX 21 +#define CH_UART3_TX 21 #define CH_SDH 22 #define CH_NFC 22 #define CH_SPI2 23 |