diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:00:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:00:53 -0400 |
| commit | 1077682b2f97cee76a79cf38bab3fa022a97d9f8 (patch) | |
| tree | e0e7dff35e3f38b9e360e702903e132c991f3f22 /include/asm-arm/arch-omap/dma.h | |
| parent | dc9ca2af4917ce4e545fa3eb1d845c555128cabc (diff) | |
| parent | bafa49cc1b800df4748b29e2b038ff029d7c8747 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/arch-omap/dma.h')
| -rw-r--r-- | include/asm-arm/arch-omap/dma.h | 1 |
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 ce114ce5af5d..04ebef5c6e95 100644 --- a/include/asm-arm/arch-omap/dma.h +++ b/include/asm-arm/arch-omap/dma.h | |||
| @@ -240,6 +240,7 @@ extern void omap_dma_unlink_lch (int lch_head, int lch_queue); | |||
| 240 | 240 | ||
| 241 | extern dma_addr_t omap_get_dma_src_pos(int lch); | 241 | extern dma_addr_t omap_get_dma_src_pos(int lch); |
| 242 | extern dma_addr_t omap_get_dma_dst_pos(int lch); | 242 | extern dma_addr_t omap_get_dma_dst_pos(int lch); |
| 243 | extern int omap_get_dma_src_addr_counter(int lch); | ||
| 243 | extern void omap_clear_dma(int lch); | 244 | extern void omap_clear_dma(int lch); |
| 244 | extern int omap_dma_running(void); | 245 | extern int omap_dma_running(void); |
| 245 | 246 | ||