diff options
author | James Bottomley <jejb@titanic.(none)> | 2005-11-10 08:29:07 -0600 |
---|---|---|
committer | James Bottomley <jejb@titanic.(none)> | 2005-11-10 08:29:07 -0600 |
commit | 8a87a0b6313109d2fea87b1271d497c954ce2ca8 (patch) | |
tree | 1b7ae51ff681e27118590e9cab4bf0ce38f5d80e /drivers/scsi/ips.h | |
parent | e6a04466ba965875a6132700fabb2f2c0249c41a (diff) | |
parent | 3b44f137b9a846c5452d9e6e1271b79b1dbcc942 (diff) | |
download | kernel_samsung_espresso10-8a87a0b6313109d2fea87b1271d497c954ce2ca8.zip kernel_samsung_espresso10-8a87a0b6313109d2fea87b1271d497c954ce2ca8.tar.gz kernel_samsung_espresso10-8a87a0b6313109d2fea87b1271d497c954ce2ca8.tar.bz2 |
Merge by hand (whitespace conflicts in libata.h)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/ips.h')
-rw-r--r-- | drivers/scsi/ips.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/scsi/ips.h b/drivers/scsi/ips.h index 179140f..f46c382 100644 --- a/drivers/scsi/ips.h +++ b/drivers/scsi/ips.h @@ -50,6 +50,7 @@ #ifndef _IPS_H_ #define _IPS_H_ +#include <linux/version.h> #include <asm/uaccess.h> #include <asm/io.h> |