Merge branches 'release', 'ejd', 'sony' and 'wmi' into release

[linux-2.6] / include / asm-blackfin / mach-bf548 / dma.h

diff --git a/include/asm-blackfin/mach-bf548/dma.h b/include/asm-blackfin/mach-bf548/dma.h
index 14cb10cc24ae587cce7ec774ce57767e8f37cde3..46ff31f20ae5b821d7205b1b20a1e910f6854483 100644 (file)
--- 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
@@ -70,5 +74,5 @@
 #define MAX_BLACKFIN_DMA_CHANNEL 32
 
 extern int channel2irq(unsigned int channel);
-extern struct dma_register *base_addr[];
+extern struct dma_register *base_addr[MAX_BLACKFIN_DMA_CHANNEL];
 #endif