diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /include/asm-um/dma-mapping.h | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
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 |