diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-01-25 05:54:33 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-01-25 05:54:33 -0500 |
| commit | 5b74f9e0e005baf12a2df6aaeef7d7134137792b (patch) | |
| tree | d3cef2c8c91fb415533e028bf55cc348d8818431 /include/linux/dmaengine.h | |
| parent | e3ee1e123183ca9847e74b7b8e2694c9e3b817a6 (diff) | |
| parent | f3b8436ad9a8ad36b3c9fa1fe030c7f38e5d3d0b (diff) | |
Merge branch 'linus' into timers/hrtimers
Diffstat (limited to 'include/linux/dmaengine.h')
| -rw-r--r-- | include/linux/dmaengine.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 64dea2ab326c..c73f1e2b59b7 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
| @@ -270,8 +270,18 @@ struct dma_device { | |||
| 270 | 270 | ||
| 271 | /* --- public DMA engine API --- */ | 271 | /* --- public DMA engine API --- */ |
| 272 | 272 | ||
| 273 | #ifdef CONFIG_DMA_ENGINE | ||
| 273 | void dmaengine_get(void); | 274 | void dmaengine_get(void); |
| 274 | void dmaengine_put(void); | 275 | void dmaengine_put(void); |
| 276 | #else | ||
| 277 | static inline void dmaengine_get(void) | ||
| 278 | { | ||
| 279 | } | ||
| 280 | static inline void dmaengine_put(void) | ||
| 281 | { | ||
| 282 | } | ||
| 283 | #endif | ||
| 284 | |||
| 275 | dma_cookie_t dma_async_memcpy_buf_to_buf(struct dma_chan *chan, | 285 | dma_cookie_t dma_async_memcpy_buf_to_buf(struct dma_chan *chan, |
| 276 | void *dest, void *src, size_t len); | 286 | void *dest, void *src, size_t len); |
| 277 | dma_cookie_t dma_async_memcpy_buf_to_pg(struct dma_chan *chan, | 287 | dma_cookie_t dma_async_memcpy_buf_to_pg(struct dma_chan *chan, |