diff options
| author | James Bottomley <jejb@raven.il.steeleye.com> | 2004-07-07 01:46:31 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.(none)> | 2004-07-07 01:46:31 -0500 |
| commit | 31400932a26b2788439fd59d0eabfb0f2cb77468 (patch) | |
| tree | 0519eae7f48e39468929a196dc1ab453ce3d3750 /include/linux/dma-mapping.h | |
| parent | 1061dd1fee1c401ff5e59a9029e1e4a93b1df8c7 (diff) | |
Fix incorrect prototype in the dma_declare_coherent_memory API
dma_mark_declared_memory_occupied() wasn't declared static inline in the NULL (default)
implementation leading to compile failures.
Diffstat (limited to 'include/linux/dma-mapping.h')
| -rw-r--r-- | include/linux/dma-mapping.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h index 024a29c1f37b..4ee5a1c03361 100644 --- a/include/linux/dma-mapping.h +++ b/include/linux/dma-mapping.h @@ -61,8 +61,9 @@ dma_release_declared_memory(struct device *dev) { } -void *dma_mark_declared_memory_occupied(struct device *dev, - dma_addr_t device_addr, size_t size) +static inline void * +dma_mark_declared_memory_occupied(struct device *dev, + dma_addr_t device_addr, size_t size) { return ERR_PTR(-EBUSY); } |