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/amiga7xx.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/amiga7xx.c')
| -rw-r--r-- | drivers/scsi/amiga7xx.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/amiga7xx.c b/drivers/scsi/amiga7xx.c index e02db80cab33..c0844fa32c5d 100644 --- a/drivers/scsi/amiga7xx.c +++ b/drivers/scsi/amiga7xx.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | #include <linux/mm.h> | 11 | #include <linux/mm.h> |
| 12 | #include <linux/blkdev.h> | 12 | #include <linux/blkdev.h> |
| 13 | #include <linux/sched.h> | 13 | #include <linux/sched.h> |
| 14 | #include <linux/version.h> | ||
| 15 | #include <linux/config.h> | 14 | #include <linux/config.h> |
| 16 | #include <linux/zorro.h> | 15 | #include <linux/zorro.h> |
| 17 | #include <linux/stat.h> | 16 | #include <linux/stat.h> |