Merge branches 'at91', 'dyntick', 'ep93xx', 'iop', 'ixp', 'misc', 'orion', 'omap...

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

diff --git a/include/asm-blackfin/mach-bf561/dma.h b/include/asm-blackfin/mach-bf561/dma.h
index 766334b7d8ab8bf3a225408bb1dc6fe353356714..8bc46cd89a0238ba3949c0bd65cdc2d2778e9e15 100644 (file)
--- a/include/asm-blackfin/mach-bf561/dma.h
+++ b/include/asm-blackfin/mach-bf561/dma.h
@@ -25,14 +25,11 @@
 #define CH_MEM_STREAM1_SRC      27      /* RX */
 #define CH_MEM_STREAM2_DEST    28
 #define CH_MEM_STREAM2_SRC     29
-#define CH_MEM_STREAM3_SRC     30
-#define CH_MEM_STREAM3_DEST    31
+#define CH_MEM_STREAM3_DEST    30
+#define CH_MEM_STREAM3_SRC     31
 #define CH_IMEM_STREAM0_DEST   32
 #define CH_IMEM_STREAM0_SRC    33
-#define CH_IMEM_STREAM1_SRC    34
-#define CH_IMEM_STREAM1_DEST   35
-
-extern int channel2irq(unsigned int channel);
-extern struct dma_register *base_addr[];
+#define CH_IMEM_STREAM1_DEST   34
+#define CH_IMEM_STREAM1_SRC    35
 
 #endif