Skip to content

Commit

Permalink
Merge branch 'release' of ssh://master.kernel.org/pub/scm/linux/kerne…
Browse files Browse the repository at this point in the history
…l/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
  • Loading branch information
Linus Torvalds committed Oct 15, 2007
2 parents 3d8a67b + 0df333c commit e457f79
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions include/asm-ia64/dma-mapping.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* David Mosberger-Tang <[email protected]>
*/
#include <asm/machvec.h>
#include <asm/scatterlist.h>

#define dma_alloc_coherent platform_dma_alloc_coherent
/* coherent mem. is cheap */
Expand Down

0 comments on commit e457f79

Please sign in to comment.