Merge branch 'release' of ssh://master.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 15 Oct 2007 22:32:57 +0000 (15:32 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 15 Oct 2007 22:32:57 +0000 (15:32 -0700)
* 'release' of ssh://master.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
  [IA64] build fix for scatterlist

include/asm-ia64/dma-mapping.h

index 6299b51575bb3f0814f2448eda09a53b62c81fe9..3ca6d5c14b2e729ca772db529e70c7e479449ab2 100644 (file)
@@ -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 */