diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-07 05:52:44 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-07 05:52:44 -0500 |
| commit | 409f0a9014fe24d906ba21aaccff80eb7f7304da (patch) | |
| tree | 8d9a6946d6cf1c5aab72651a193ff860651e5e65 /include/linux | |
| parent | 593721833d2a3987736467144ad062a709d3a72c (diff) | |
| parent | 0b492fce3d72d982a7981905f85484a1e1ba7fde (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/dmaengine.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 3e0f64c335c8..3e68469c1885 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h | |||
| @@ -282,6 +282,18 @@ static inline void dmaengine_put(void) | |||
| 282 | } | 282 | } |
| 283 | #endif | 283 | #endif |
| 284 | 284 | ||
| 285 | #ifdef CONFIG_NET_DMA | ||
| 286 | #define net_dmaengine_get() dmaengine_get() | ||
| 287 | #define net_dmaengine_put() dmaengine_put() | ||
| 288 | #else | ||
| 289 | static inline void net_dmaengine_get(void) | ||
| 290 | { | ||
| 291 | } | ||
| 292 | static inline void net_dmaengine_put(void) | ||
| 293 | { | ||
| 294 | } | ||
| 295 | #endif | ||
| 296 | |||
| 285 | dma_cookie_t dma_async_memcpy_buf_to_buf(struct dma_chan *chan, | 297 | dma_cookie_t dma_async_memcpy_buf_to_buf(struct dma_chan *chan, |
| 286 | void *dest, void *src, size_t len); | 298 | void *dest, void *src, size_t len); |
| 287 | dma_cookie_t dma_async_memcpy_buf_to_pg(struct dma_chan *chan, | 299 | dma_cookie_t dma_async_memcpy_buf_to_pg(struct dma_chan *chan, |