---

yaml --- r: 137173 b: refs/heads/master c: 308d333 h: refs/heads/master i: 137171: b86bd48 v: v3
git-mirror · Feb 21, 2009 · 85a45d5 · 85a45d5
1 parent 15dd343
commit 85a45d5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f0ffc816250a8cc28e6824326e2d58333e058eca
+refs/heads/master: 308d333ad6cc12e39adaed22dc10bac48e17742a
diff --git a/trunk/arch/arm/include/asm/mach/dma.h b/trunk/arch/arm/include/asm/mach/dma.h
@@ -43,19 +43,6 @@ struct dma_struct {
 	const struct dma_ops *d_ops;
 };
 
-struct floppy_dma {
-	struct dma_struct	dma;
-	unsigned int		fiq;
-};
-
-struct iomd_dma {
-	struct dma_struct	dma;
-	unsigned int		state;
-	unsigned long		base;		/* Controller base address */
-	int			irq;		/* Controller IRQ */
-	struct scatterlist	cur_sg;		/* Current controller buffer */
-};
-
 /*
  * isa_dma_add - add an ISA-style DMA channel
  */

diff --git a/trunk/arch/arm/mach-rpc/dma.c b/trunk/arch/arm/mach-rpc/dma.c
@@ -26,6 +26,14 @@
 #include <asm/mach/dma.h>
 #include <asm/hardware/iomd.h>
 
+struct iomd_dma {
+	struct dma_struct	dma;
+	unsigned int		state;
+	unsigned long		base;		/* Controller base address */
+	int			irq;		/* Controller IRQ */
+	struct scatterlist	cur_sg;		/* Current controller buffer */
+};
+
 #if 0
 typedef enum {
 	dma_size_8	= 1,
@@ -242,6 +250,11 @@ static struct fiq_handler fh = {
 	.name	= "floppydma"
 };
 
+struct floppy_dma {
+	struct dma_struct	dma;
+	unsigned int		fiq;
+};
+
 static void floppy_enable_dma(unsigned int chan, dma_t *dma)
 {
 	struct floppy_dma *fdma = container_of(dma, struct floppy_dma, dma);