diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 09:29:07 -0500 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /drivers/scsi/sata_via.c | |
| parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
| parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/sata_via.c')
| -rw-r--r-- | drivers/scsi/sata_via.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/sata_via.c b/drivers/scsi/sata_via.c index 09d3d96de0c3..ab19d2ba2a4b 100644 --- a/drivers/scsi/sata_via.c +++ b/drivers/scsi/sata_via.c | |||
| @@ -42,7 +42,6 @@ | |||
| 42 | #include <linux/blkdev.h> | 42 | #include <linux/blkdev.h> |
| 43 | #include <linux/delay.h> | 43 | #include <linux/delay.h> |
| 44 | #include <linux/device.h> | 44 | #include <linux/device.h> |
| 45 | #include "scsi.h" | ||
| 46 | #include <scsi/scsi_host.h> | 45 | #include <scsi/scsi_host.h> |
| 47 | #include <linux/libata.h> | 46 | #include <linux/libata.h> |
| 48 | #include <asm/io.h> | 47 | #include <asm/io.h> |