diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 15:43:21 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-03 15:43:21 -0400 |
| commit | 160acc2e899f26356bde92bc257253b7ca78f0c3 (patch) | |
| tree | c60782685ac0fdf4b2d6278c4be639181dd65126 /include/scsi/libsas.h | |
| parent | a7e1e001f432d5960b929787a2a261cf5a7ddac5 (diff) | |
| parent | c46f2334c84c2b26baa64d42d75ddc5fab38c3dc (diff) | |
Merge branch 'sg' of git://git.kernel.dk/linux-2.6-block
* 'sg' of git://git.kernel.dk/linux-2.6-block:
[SG] Get rid of __sg_mark_end()
cleanup asm/scatterlist.h includes
SG: Make sg_init_one() use general table init functions
Diffstat (limited to 'include/scsi/libsas.h')
| -rw-r--r-- | include/scsi/libsas.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h index 8dda2d66b5b9..a466c2cb8955 100644 --- a/include/scsi/libsas.h +++ b/include/scsi/libsas.h | |||
| @@ -36,7 +36,7 @@ | |||
| 36 | #include <scsi/scsi_device.h> | 36 | #include <scsi/scsi_device.h> |
| 37 | #include <scsi/scsi_cmnd.h> | 37 | #include <scsi/scsi_cmnd.h> |
| 38 | #include <scsi/scsi_transport_sas.h> | 38 | #include <scsi/scsi_transport_sas.h> |
| 39 | #include <asm/scatterlist.h> | 39 | #include <linux/scatterlist.h> |
| 40 | 40 | ||
| 41 | struct block_device; | 41 | struct block_device; |
| 42 | 42 | ||