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/ibmmca.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/ibmmca.c')
| -rw-r--r-- | drivers/scsi/ibmmca.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/drivers/scsi/ibmmca.c b/drivers/scsi/ibmmca.c index 05ecc911e94c..b60c1b9270f1 100644 --- a/drivers/scsi/ibmmca.c +++ b/drivers/scsi/ibmmca.c | |||
| @@ -18,12 +18,6 @@ | |||
| 18 | */ | 18 | */ |
| 19 | 19 | ||
| 20 | #include <linux/config.h> | 20 | #include <linux/config.h> |
| 21 | #ifndef LINUX_VERSION_CODE | ||
| 22 | #include <linux/version.h> | ||
| 23 | #endif | ||
| 24 | #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,45) | ||
| 25 | #error "This driver works only with kernel 2.5.45 or higher!" | ||
| 26 | #endif | ||
| 27 | #include <linux/module.h> | 21 | #include <linux/module.h> |
| 28 | #include <linux/kernel.h> | 22 | #include <linux/kernel.h> |
| 29 | #include <linux/types.h> | 23 | #include <linux/types.h> |