git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx
[sfrench/cifs-2.6.git]
/
arch
/
m68knommu
/
kernel
/
dma.c
diff --git
a/arch/m68knommu/kernel/dma.c
b/arch/m68knommu/kernel/dma.c
index 0a25874a2aaefb5c4a4821688086c075a2e00532..e10eafc52789e5f8dc3ca428449ff8fd0adb0b1e 100644
(file)
--- a/
arch/m68knommu/kernel/dma.c
+++ b/
arch/m68knommu/kernel/dma.c
@@
-8,6
+8,7
@@
#include <linux/types.h>
#include <linux/mm.h>
#include <linux/string.h>
+#include <linux/device.h>
#include <asm/io.h>
void *dma_alloc_coherent(struct device *dev, size_t size,