diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 08:53:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 08:53:41 -0700 |
| commit | ba1c28a94322865457ad59f80474615156065123 (patch) | |
| tree | a1de9e1b7aba07583e49ff1c3f1c495cf148475a /arch/arm/common/dmabounce.c | |
| parent | 101e4d91f5e8c78d64970c03323d942d6706320f (diff) | |
| parent | cb92ae81509eb5ddaea53884b60437502c837405 (diff) | |
| download | linux-stable-ba1c28a94322865457ad59f80474615156065123.tar.gz linux-stable-ba1c28a94322865457ad59f80474615156065123.tar.bz2 linux-stable-ba1c28a94322865457ad59f80474615156065123.zip | |
Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block
* 'sg' of git://git.kernel.dk/linux-2.6-block:
sparc64: zero out dma_length
fvr32: fixup dma-mapping for new sg layout
sh/sh64: fixup dma-mapping for new sg layout
Fix sctp compile
m68knommu: remove sg_address()
frv: update comment in scatterlist to reflect new setup
blackfin: remove sg_address()
arm: sg fallout
mips: sg_page() fallout
alpha: sg_virt() fallout
intel-iommu: fix sg_page()
parisc: fix sg_page() fallout
ide: build fix
net: fix xfrm build - missing scatterlist.h include
[BLOCK] blk_rq_map_sg: force clear termination bit
[BLOCK] Don't clear sg_dma_len/addr() in blk_rq_map_sg()
s390 zfcp: sg fixups
powerpc: Fix fallout from sg_page() changes
IB/ehca: Fix sg_page() fallout
arm: build fix
Diffstat (limited to 'arch/arm/common/dmabounce.c')
| -rw-r--r-- | arch/arm/common/dmabounce.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/common/dmabounce.c b/arch/arm/common/dmabounce.c index 9d371e476552..52fc6a883281 100644 --- a/arch/arm/common/dmabounce.c +++ b/arch/arm/common/dmabounce.c @@ -29,6 +29,7 @@ #include <linux/dma-mapping.h> #include <linux/dmapool.h> #include <linux/list.h> +#include <linux/scatterlist.h> #include <asm/cacheflush.h> |