diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-06-14 08:45:06 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-06-14 08:45:06 -0400 |
commit | 9deaa3bcff657f6e54e869ac1507c7ea8088fd09 (patch) | |
tree | 6c1508ef0ce2adfe50501002b1c487b7fbab2379 /arch/sh/include | |
parent | 4822994a238b44ab5d162243077fe6273171fbab (diff) |
sh: Convert to asm-generic/dma.h.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/include')
-rw-r--r-- | arch/sh/include/asm/dma.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/arch/sh/include/asm/dma.h b/arch/sh/include/asm/dma.h index 6bd178473878..04ad0e1e637e 100644 --- a/arch/sh/include/asm/dma.h +++ b/arch/sh/include/asm/dma.h | |||
@@ -16,13 +16,7 @@ | |||
16 | #include <linux/sched.h> | 16 | #include <linux/sched.h> |
17 | #include <linux/sysdev.h> | 17 | #include <linux/sysdev.h> |
18 | #include <cpu/dma.h> | 18 | #include <cpu/dma.h> |
19 | 19 | #include <asm-generic/dma.h> | |
20 | /* The maximum address that we can perform a DMA transfer to on this platform */ | ||
21 | /* Don't define MAX_DMA_ADDRESS; it's useless on the SuperH and any | ||
22 | occurrence should be flagged as an error. */ | ||
23 | /* But... */ | ||
24 | /* XXX: This is not applicable to SuperH, just needed for alloc_bootmem */ | ||
25 | #define MAX_DMA_ADDRESS (PAGE_OFFSET+0x10000000) | ||
26 | 20 | ||
27 | #ifdef CONFIG_NR_DMA_CHANNELS | 21 | #ifdef CONFIG_NR_DMA_CHANNELS |
28 | # define MAX_DMA_CHANNELS (CONFIG_NR_DMA_CHANNELS) | 22 | # define MAX_DMA_CHANNELS (CONFIG_NR_DMA_CHANNELS) |
@@ -137,8 +131,6 @@ extern int dma_xfer(unsigned int chan, unsigned long from, | |||
137 | 131 | ||
138 | extern int request_dma_bycap(const char **dmac, const char **caps, | 132 | extern int request_dma_bycap(const char **dmac, const char **caps, |
139 | const char *dev_id); | 133 | const char *dev_id); |
140 | extern int request_dma(unsigned int chan, const char *dev_id); | ||
141 | extern void free_dma(unsigned int chan); | ||
142 | extern int get_dma_residue(unsigned int chan); | 134 | extern int get_dma_residue(unsigned int chan); |
143 | extern struct dma_info *get_dma_info(unsigned int chan); | 135 | extern struct dma_info *get_dma_info(unsigned int chan); |
144 | extern struct dma_channel *get_dma_channel(unsigned int chan); | 136 | extern struct dma_channel *get_dma_channel(unsigned int chan); |