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/scsi_debug.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/scsi_debug.c')
| -rw-r--r-- | drivers/scsi/scsi_debug.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 9eb08b15c0b1..3ded9daaf4a0 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c | |||
| @@ -48,10 +48,6 @@ | |||
| 48 | 48 | ||
| 49 | #include <linux/stat.h> | 49 | #include <linux/stat.h> |
| 50 | 50 | ||
| 51 | #ifndef LINUX_VERSION_CODE | ||
| 52 | #include <linux/version.h> | ||
| 53 | #endif | ||
| 54 | |||
| 55 | #include "scsi_logging.h" | 51 | #include "scsi_logging.h" |
| 56 | #include "scsi_debug.h" | 52 | #include "scsi_debug.h" |
| 57 | 53 | ||