[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 5166145..9e614a1 100644
--- a/arch/arm/include/asm/mach/dma.h
+++ b/arch/arm/include/asm/mach/dma.h
@@ -43,19 +43,6 @@
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 a5987bb..1f77cdc 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 @@
.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);