git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'tip/perf/jump-label-2' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
arm
/
mach-imx
/
include
/
mach
/
dma-v1.h
diff --git
a/arch/arm/mach-imx/include/mach/dma-v1.h
b/arch/arm/mach-imx/include/mach/dma-v1.h
index
287431c
..
ac6fd71
100644
(file)
--- a/
arch/arm/mach-imx/include/mach/dma-v1.h
+++ b/
arch/arm/mach-imx/include/mach/dma-v1.h
@@
-27,6
+27,8
@@
#define imx_has_dma_v1() (cpu_is_mx1() || cpu_is_mx21() || cpu_is_mx27())
#define imx_has_dma_v1() (cpu_is_mx1() || cpu_is_mx21() || cpu_is_mx27())
+#include <mach/dma.h>
+
#define IMX_DMA_CHANNELS 16
#define DMA_MODE_READ 0
#define IMX_DMA_CHANNELS 16
#define DMA_MODE_READ 0
@@
-96,12
+98,6
@@
int imx_dma_request(int channel, const char *name);
void imx_dma_free(int channel);
void imx_dma_free(int channel);
-enum imx_dma_prio {
- DMA_PRIO_HIGH = 0,
- DMA_PRIO_MEDIUM = 1,
- DMA_PRIO_LOW = 2
-};
-
int imx_dma_request_by_prio(const char *name, enum imx_dma_prio prio);
#endif /* __MACH_DMA_V1_H__ */
int imx_dma_request_by_prio(const char *name, enum imx_dma_prio prio);
#endif /* __MACH_DMA_V1_H__ */