summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-15 15:32:57 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-15 15:32:57 -0700
commite457f790d8b05977853aa238bbc667b3bb375671 (patch)
tree9a6688e306588d129c86e6e38e3be701c294f7fc
parent3d8a67b9f0428de3d8b76984c5c38675a7f4abd4 (diff)
parent0df333ce01fedad1f7a4f281063a02d76ba33a7d (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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-ia64/dma-mapping.h b/include/asm-ia64/dma-mapping.h
index 6299b51575b..3ca6d5c14b2 100644
--- a/include/asm-ia64/dma-mapping.h
+++ b/include/asm-ia64/dma-mapping.h
@@ -6,6 +6,7 @@
* David Mosberger-Tang <davidm@hpl.hp.com>
*/
#include <asm/machvec.h>
+#include <asm/scatterlist.h>
#define dma_alloc_coherent platform_dma_alloc_coherent
/* coherent mem. is cheap */