diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 12:08:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 12:08:13 -0400 |
| commit | b6257a9036f06878a0f02354d5a07f155e1cfee0 (patch) | |
| tree | c0e12e3568199b748ebc7c1f9cf4005ae5da5f36 /arch/sparc64/kernel/iommu_common.h | |
| parent | c548f08a4f7b89b93c805e0c4024b8302afa7121 (diff) | |
| parent | f5c0dde4c66421a3a2d7d6fa604a712c9b0744e5 (diff) | |
Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block
* 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block:
[SCSI] Remove full sg table memset()
[SCSI] ide-scsi: remove usage of sg_last()
Fix loop terminating conditions in fill_sg().
[BLOCK] Clear sg entry before filling in blk_rq_map_sg()
IA64: iommu uses sg_next with an invalid sg element
cciss: disable DMA refetch on Smart Array P600
swiotlb: fix map_sg failure handling
SPARC64: fix iommu sg chaining
[SCSI] ide-scsi: use scsi_sg_count() instead of ->use_sg
Diffstat (limited to 'arch/sparc64/kernel/iommu_common.h')
| -rw-r--r-- | arch/sparc64/kernel/iommu_common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/iommu_common.h b/arch/sparc64/kernel/iommu_common.h index ad791014419c..75b5a5814522 100644 --- a/arch/sparc64/kernel/iommu_common.h +++ b/arch/sparc64/kernel/iommu_common.h | |||
| @@ -8,6 +8,7 @@ | |||
| 8 | #include <linux/types.h> | 8 | #include <linux/types.h> |
| 9 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
| 10 | #include <linux/mm.h> | 10 | #include <linux/mm.h> |
| 11 | #include <linux/scatterlist.h> | ||
| 11 | 12 | ||
| 12 | #include <asm/iommu.h> | 13 | #include <asm/iommu.h> |
| 13 | #include <asm/scatterlist.h> | 14 | #include <asm/scatterlist.h> |