diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:38:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 12:38:04 +0200 |
| commit | 5fbf24659b75356e2142e1f1b88f67b34cbc3e75 (patch) | |
| tree | 0e470e4cc89b72e3d74939f8c39396a6a0bebb3a /include/asm-sh/dma-mapping.h | |
| parent | d89961e2dc87b6e30b8e3f60bd2af5cd92cf4643 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
| download | talos-obmc-linux-5fbf24659b75356e2142e1f1b88f67b34cbc3e75.tar.gz talos-obmc-linux-5fbf24659b75356e2142e1f1b88f67b34cbc3e75.zip | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'include/asm-sh/dma-mapping.h')
| -rw-r--r-- | include/asm-sh/dma-mapping.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-sh/dma-mapping.h b/include/asm-sh/dma-mapping.h index 6c0b8a2de143..627315ecdb52 100644 --- a/include/asm-sh/dma-mapping.h +++ b/include/asm-sh/dma-mapping.h @@ -5,6 +5,7 @@ #include <linux/scatterlist.h> #include <asm/cacheflush.h> #include <asm/io.h> +#include <asm-generic/dma-coherent.h> extern struct bus_type pci_bus_type; |
