aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/include/asm/mach/dma.h13
-rw-r--r--arch/arm/mach-rpc/dma.c13
2 files changed, 13 insertions, 13 deletions
diff --git a/arch/arm/include/asm/mach/dma.h b/arch/arm/include/asm/mach/dma.h
index 5166145d8a3..9e614a18e68 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 a5987bbed60..1f77cdca26e 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);