mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 21:21:41 +00:00
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
This commit is contained in:
commit
e457f790d8
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user