diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-10-27 18:15:57 -0400 |
| commit | b74b953b998bcc2db91b694446f3a2619ec32de6 (patch) | |
| tree | 6ce24caabd730f6ae9287ed0676ec32e6ff31e9d /include/asm-generic/dma-mapping-broken.h | |
| parent | abb438526201c6a79949ad45375c051b6681c253 (diff) | |
| parent | f6f94e2ab1b33f0082ac22d71f66385a60d8157f (diff) | |
Merge commit 'v2.6.36' into kbuild/misc
Update to be able to fix a recent change to scripts/basic/docproc.c
(commit eda603f).
Diffstat (limited to 'include/asm-generic/dma-mapping-broken.h')
| -rw-r--r-- | include/asm-generic/dma-mapping-broken.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-generic/dma-mapping-broken.h b/include/asm-generic/dma-mapping-broken.h index 82cd0cb1c3fe..ccf7b4f34a3c 100644 --- a/include/asm-generic/dma-mapping-broken.h +++ b/include/asm-generic/dma-mapping-broken.h | |||
| @@ -72,9 +72,6 @@ dma_set_mask(struct device *dev, u64 mask); | |||
| 72 | extern int | 72 | extern int |
| 73 | dma_get_cache_alignment(void); | 73 | dma_get_cache_alignment(void); |
| 74 | 74 | ||
| 75 | extern int | ||
| 76 | dma_is_consistent(struct device *dev, dma_addr_t dma_handle); | ||
| 77 | |||
| 78 | extern void | 75 | extern void |
| 79 | dma_cache_sync(struct device *dev, void *vaddr, size_t size, | 76 | dma_cache_sync(struct device *dev, void *vaddr, size_t size, |
| 80 | enum dma_data_direction direction); | 77 | enum dma_data_direction direction); |