diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 18:32:57 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-15 18:32:57 -0400 |
| commit | e457f790d8b05977853aa238bbc667b3bb375671 (patch) | |
| tree | 9a6688e306588d129c86e6e38e3be701c294f7fc | |
| parent | 3d8a67b9f0428de3d8b76984c5c38675a7f4abd4 (diff) | |
| parent | 0df333ce01fedad1f7a4f281063a02d76ba33a7d (diff) | |
Merge branch 'release' of ssh://master.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of ssh://master.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] build fix for scatterlist
| -rw-r--r-- | include/asm-ia64/dma-mapping.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ia64/dma-mapping.h b/include/asm-ia64/dma-mapping.h index 6299b51575bb..3ca6d5c14b2e 100644 --- a/include/asm-ia64/dma-mapping.h +++ b/include/asm-ia64/dma-mapping.h | |||
| @@ -6,6 +6,7 @@ | |||
| 6 | * David Mosberger-Tang <davidm@hpl.hp.com> | 6 | * David Mosberger-Tang <davidm@hpl.hp.com> |
| 7 | */ | 7 | */ |
| 8 | #include <asm/machvec.h> | 8 | #include <asm/machvec.h> |
| 9 | #include <asm/scatterlist.h> | ||
| 9 | 10 | ||
| 10 | #define dma_alloc_coherent platform_dma_alloc_coherent | 11 | #define dma_alloc_coherent platform_dma_alloc_coherent |
| 11 | /* coherent mem. is cheap */ | 12 | /* coherent mem. is cheap */ |