diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-03 09:15:35 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-03 09:15:35 +0100 |
| commit | b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15 (patch) | |
| tree | 99e5b423473097756353d038f922b2623f3edd2a /arch/alpha/include/asm/dma-mapping.h | |
| parent | tun: Check supplemental groups in TUN/TAP driver. (diff) | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds... (diff) | |
| download | linux-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.tar.xz linux-b3ff29d2ccfe3af065a9b393699a8fbf2abd1b15.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/Kconfig
Diffstat (limited to 'arch/alpha/include/asm/dma-mapping.h')
| -rw-r--r-- | arch/alpha/include/asm/dma-mapping.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/alpha/include/asm/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h index a5801ae02e4b..04eb5681448c 100644 --- a/arch/alpha/include/asm/dma-mapping.h +++ b/arch/alpha/include/asm/dma-mapping.h @@ -29,6 +29,8 @@ #else /* no PCI - no IOMMU. */ +#include <asm/io.h> /* for virt_to_phys() */ + struct scatterlist; void *dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp); |