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

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
e457f790 · Linus Torvalds · 3d8a67b9 · 0df333ce · e457f790
隐藏空白更改
内联并排

Showing with 1 addition and 0 deletion

include/asm-ia64/dma-mapping.h include/asm-ia64/dma-mapping.h +1 -0

未找到文件。
--- 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 */