diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 05:32:17 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 05:32:17 -0400 |
| commit | 206855c321adee56db3946ca09a5887cddb9d598 (patch) | |
| tree | 13a2729d4d0e37170552bd9ad3c6bba71ba0c55c /include/asm-um/dma-mapping.h | |
| parent | e8d3f455de4f42d4bab2f6f1aeb2cf3bd18eb508 (diff) | |
| parent | cb58ffc3889f0545628f138f849e759a331b8ddc (diff) | |
Merge branch 'x86/urgent' into core/signal
Conflicts:
arch/x86/kernel/signal_64.c
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 |