diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-10-20 11:07:19 -0400 |
| commit | 61e0e79ee3c609eb34edf2fe023708cba6a79b1f (patch) | |
| tree | 663deacffd4071120dc9badb70428fe5f124c7b9 /include/asm-um/dma-mapping.h | |
| parent | c15895ef30c2c03e99802951787183039a349d32 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'master' into for-upstream
Conflicts:
Documentation/ABI/testing/sysfs-bus-usb
drivers/Makefile
Diffstat (limited to 'include/asm-um/dma-mapping.h')
| -rw-r--r-- | include/asm-um/dma-mapping.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-um/dma-mapping.h b/include/asm-um/dma-mapping.h index f0ee4fb55911..90fc708b320e 100644 --- a/include/asm-um/dma-mapping.h +++ b/include/asm-um/dma-mapping.h | |||
| @@ -118,4 +118,11 @@ dma_cache_sync(struct device *dev, void *vaddr, size_t size, | |||
| 118 | BUG(); | 118 | BUG(); |
| 119 | } | 119 | } |
| 120 | 120 | ||
| 121 | static inline int | ||
| 122 | dma_mapping_error(struct device *dev, dma_addr_t dma_handle) | ||
| 123 | { | ||
| 124 | BUG(); | ||
| 125 | return 0; | ||
| 126 | } | ||
| 127 | |||
| 121 | #endif | 128 | #endif |