aboutsummaryrefslogtreecommitdiff
path: root/include/asm-arm/arch-omap/dma.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-07-10 12:57:49 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-10 12:57:49 -0700
commit5c23804a0941a111752fdacefe0bea2db1b4d93f (patch)
tree482436cd247783c7df3d522fdc4ee51e2b3e87dc /include/asm-arm/arch-omap/dma.h
parent58c853c6eabe93ab5e5daf7150fbb4e562acbb79 (diff)
parentec6bced6c7b92904f5ead39c9c1b8dc734e6eff0 (diff)
Merge master.kernel.org:~rmk/linux-2.6-arm.git
Diffstat (limited to 'include/asm-arm/arch-omap/dma.h')
-rw-r--r--include/asm-arm/arch-omap/dma.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-arm/arch-omap/dma.h b/include/asm-arm/arch-omap/dma.h
index d785248377d..ce114ce5af5 100644
--- a/include/asm-arm/arch-omap/dma.h
+++ b/include/asm-arm/arch-omap/dma.h
@@ -241,6 +241,7 @@ extern void omap_dma_unlink_lch (int lch_head, int lch_queue);
extern dma_addr_t omap_get_dma_src_pos(int lch);
extern dma_addr_t omap_get_dma_dst_pos(int lch);
extern void omap_clear_dma(int lch);
+extern int omap_dma_running(void);
/* Returns 1 if the DMA module is in OMAP1510-compatible mode, 0 otherwise */
extern int omap_dma_in_1510_mode(void);