From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 21 Feb 2009 21:36:22 +0000 (+0000)
Subject: [ARM] dma: move IOMD and floppy DMA structures to RiscPC DMA code
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=308d333ad6cc12e39adaed22dc10bac48e17742a;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

[ARM] dma: move IOMD and floppy DMA structures to RiscPC DMA code

There's no point these being in a generic include file when they're
only used in arch/arm/mach-rpc/dma.c.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
index 5166145d8a3c..9e614a18e680 100644
--- a/arch/arm/include/asm/mach/dma.h
+++ b/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/arch/arm/mach-rpc/dma.c b/arch/arm/mach-rpc/dma.c
index a5987bbed60d..1f77cdca26e9 100644
--- a/arch/arm/mach-rpc/dma.c
+++ b/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);