diff options
| author | James Bottomley | 2005-11-10 15:29:07 +0100 |
|---|---|---|
| committer | James Bottomley | 2005-11-10 15:29:07 +0100 |
| commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
| tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /drivers/scsi/sgiwd93.c | |
| parent | [SCSI] qla2xxx: Update version number to 8.01.03-k. (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | kernel-qcow2-linux-8a87a0b6313109d2fea87b1271d497c954ce2ca8.tar.gz kernel-qcow2-linux-8a87a0b6313109d2fea87b1271d497c954ce2ca8.tar.xz kernel-qcow2-linux-8a87a0b6313109d2fea87b1271d497c954ce2ca8.zip | |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/sgiwd93.c')
| -rw-r--r-- | drivers/scsi/sgiwd93.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/sgiwd93.c b/drivers/scsi/sgiwd93.c index 0a0d8a908c74..bf2ceb54354c 100644 --- a/drivers/scsi/sgiwd93.c +++ b/drivers/scsi/sgiwd93.c @@ -15,7 +15,6 @@ #include <linux/types.h> #include <linux/mm.h> #include <linux/blkdev.h> -#include <linux/version.h> #include <linux/delay.h> #include <linux/dma-mapping.h> #include <linux/spinlock.h> |