diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-30 12:23:30 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-30 12:23:30 -0500 |
| commit | c43e0e46adf79c321ed3fbf0351e1005fb8a2413 (patch) | |
| tree | 35b9ab361651f649d3c9aa69f159812eba50d154 /arch/alpha/include/asm/dma-mapping.h | |
| parent | dba3d36b2f0842ed7f25c33cd3a2ccdb3d0df9db (diff) | |
| parent | f2257b70b0f9b2fe8f2afd83fc6798dca75930b8 (diff) | |
Merge branch 'linus' into core/percpu
Conflicts:
kernel/irq/handle.c
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 @@ | |||
| 29 | 29 | ||
| 30 | #else /* no PCI - no IOMMU. */ | 30 | #else /* no PCI - no IOMMU. */ |
| 31 | 31 | ||
| 32 | #include <asm/io.h> /* for virt_to_phys() */ | ||
| 33 | |||
| 32 | struct scatterlist; | 34 | struct scatterlist; |
| 33 | void *dma_alloc_coherent(struct device *dev, size_t size, | 35 | void *dma_alloc_coherent(struct device *dev, size_t size, |
| 34 | dma_addr_t *dma_handle, gfp_t gfp); | 36 | dma_addr_t *dma_handle, gfp_t gfp); |