Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[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 fcc8b4c34c6a628fedb54ce01f9c44d4dbe4a9df..4d97d3aa97cd938f5db367cfd84f28eaa742a3ae 100644 (file)
--- a/include/asm-blackfin/mach-bf548/dma.h
+++ b/include/asm-blackfin/mach-bf548/dma.h
@@ -55,6 +55,7 @@
 #define CH_SPORT3_RX           20
 #define CH_SPORT3_TX           21
 #define CH_SDH                 22
+#define CH_NFC                 22
 #define CH_SPI2                        23
 
 #define CH_MEM_STREAM0_DEST    24
@@ -69,5 +70,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