git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
m68knommu
/
kernel
/
dma.c
diff --git
a/arch/m68knommu/kernel/dma.c
b/arch/m68knommu/kernel/dma.c
index
e10eafc
..
9361258
100644
(file)
--- a/
arch/m68knommu/kernel/dma.c
+++ b/
arch/m68knommu/kernel/dma.c
@@
-9,10
+9,11
@@
#include <linux/mm.h>
#include <linux/string.h>
#include <linux/device.h>
#include <linux/mm.h>
#include <linux/string.h>
#include <linux/device.h>
+#include <linux/dma-mapping.h>
#include <asm/io.h>
void *dma_alloc_coherent(struct device *dev, size_t size,
#include <asm/io.h>
void *dma_alloc_coherent(struct device *dev, size_t size,
- dma_addr_t *dma_handle,
in
t gfp)
+ dma_addr_t *dma_handle,
gfp_
t gfp)
{
void *ret;
/* ignore region specifiers */
{
void *ret;
/* ignore region specifiers */
@@
-34,3
+35,8
@@
void dma_free_coherent(struct device *dev, size_t size,
{
free_pages((unsigned long)vaddr, get_order(size));
}
{
free_pages((unsigned long)vaddr, get_order(size));
}
+
+void dma_sync_single_for_cpu(struct device *dev, dma_addr_t handle, size_t size, enum dma_data_direction dir)
+{
+}
+