diff options
| author | Jens Axboe <axboe@carl.home.kernel.dk> | 2007-10-24 13:25:26 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@carl.home.kernel.dk> | 2007-10-24 13:25:26 +0200 |
| commit | 5d9dc2cfd881b3b93c3f819ee94ad3ab7184b29a (patch) | |
| tree | bad15f7975cd64c685b2a370a3af6660550d4bc1 /include | |
| parent | 3d1266c7042e696704e22085a0f55c714bc06194 (diff) | |
| parent | 18ccc4194389c6edc78ede76ada3bf753525b11c (diff) | |
| download | op-kernel-dev-5d9dc2cfd881b3b93c3f819ee94ad3ab7184b29a.zip op-kernel-dev-5d9dc2cfd881b3b93c3f819ee94ad3ab7184b29a.tar.gz | |
Merge branch 'for-linus' of ssh://master.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6 into sg
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-avr32/dma-mapping.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-avr32/dma-mapping.h b/include/asm-avr32/dma-mapping.h index a713163..57dc672 100644 --- a/include/asm-avr32/dma-mapping.h +++ b/include/asm-avr32/dma-mapping.h @@ -3,7 +3,7 @@ #include <linux/mm.h> #include <linux/device.h> -#include <asm/scatterlist.h> +#include <linux/scatterlist.h> #include <asm/processor.h> #include <asm/cacheflush.h> #include <asm/io.h> |
