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/bvme6000.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/bvme6000.c')
| -rw-r--r-- | drivers/scsi/bvme6000.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/bvme6000.c b/drivers/scsi/bvme6000.c index 3c43928ab402..2958b8c2bfb7 100644 --- a/drivers/scsi/bvme6000.c +++ b/drivers/scsi/bvme6000.c | |||
| @@ -7,7 +7,6 @@ | |||
| 7 | #include <linux/mm.h> | 7 | #include <linux/mm.h> |
| 8 | #include <linux/blkdev.h> | 8 | #include <linux/blkdev.h> |
| 9 | #include <linux/sched.h> | 9 | #include <linux/sched.h> |
| 10 | #include <linux/version.h> | ||
| 11 | #include <linux/zorro.h> | 10 | #include <linux/zorro.h> |
| 12 | 11 | ||
| 13 | #include <asm/setup.h> | 12 | #include <asm/setup.h> |