summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-07-05 21:08:35 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-07-05 21:08:35 -0700
commite2a305ecb5734f24d3a4496605a6fdf27ddf7108 (patch)
tree20bd9565d404f42d368f0b095a6727e8c1f1c983 /include
parent66337dab951a9da0873bb1d7dbf36fb668417274 (diff)
parent37e64e5ae1a9554762b6ec494871adcf48be20cf (diff)
downloadtalos-obmc-linux-e2a305ecb5734f24d3a4496605a6fdf27ddf7108.tar.gz
talos-obmc-linux-e2a305ecb5734f24d3a4496605a6fdf27ddf7108.zip
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC64]: Fix stack overflow checking in modular non-SMP kernels. [SPARC64]: Fix sparc64 build errors when CONFIG_PCI=n.
Diffstat (limited to 'include')
-rw-r--r--include/asm-sparc64/dma-mapping.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/include/asm-sparc64/dma-mapping.h b/include/asm-sparc64/dma-mapping.h
index 0f5b89c9323b..27c46fbeebd6 100644
--- a/include/asm-sparc64/dma-mapping.h
+++ b/include/asm-sparc64/dma-mapping.h
@@ -160,6 +160,20 @@ static inline void dma_free_coherent(struct device *dev, size_t size,
BUG();
}
+static inline void
+dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma_handle, size_t size,
+ enum dma_data_direction direction)
+{
+ BUG();
+}
+
+static inline void
+dma_sync_single_for_device(struct device *dev, dma_addr_t dma_handle, size_t size,
+ enum dma_data_direction direction)
+{
+ BUG();
+}
+
#endif /* PCI */
OpenPOWER on IntegriCloud