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/aic7xxx | |
| 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/aic7xxx')
| -rw-r--r-- | drivers/scsi/aic7xxx/aic79xx_osm.h | 1 | ||||
| -rw-r--r-- | drivers/scsi/aic7xxx/aic7xxx_osm.h | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h index 052c6619accc..bc44222d6cc3 100644 --- a/drivers/scsi/aic7xxx/aic79xx_osm.h +++ b/drivers/scsi/aic7xxx/aic79xx_osm.h | |||
| @@ -49,7 +49,6 @@ | |||
| 49 | #include <linux/ioport.h> | 49 | #include <linux/ioport.h> |
| 50 | #include <linux/pci.h> | 50 | #include <linux/pci.h> |
| 51 | #include <linux/smp_lock.h> | 51 | #include <linux/smp_lock.h> |
| 52 | #include <linux/version.h> | ||
| 53 | #include <linux/interrupt.h> | 52 | #include <linux/interrupt.h> |
| 54 | #include <linux/module.h> | 53 | #include <linux/module.h> |
| 55 | #include <linux/slab.h> | 54 | #include <linux/slab.h> |
diff --git a/drivers/scsi/aic7xxx/aic7xxx_osm.h b/drivers/scsi/aic7xxx/aic7xxx_osm.h index be9edbe26dbe..f2a95447142c 100644 --- a/drivers/scsi/aic7xxx/aic7xxx_osm.h +++ b/drivers/scsi/aic7xxx/aic7xxx_osm.h | |||
| @@ -66,7 +66,6 @@ | |||
| 66 | #include <linux/ioport.h> | 66 | #include <linux/ioport.h> |
| 67 | #include <linux/pci.h> | 67 | #include <linux/pci.h> |
| 68 | #include <linux/smp_lock.h> | 68 | #include <linux/smp_lock.h> |
| 69 | #include <linux/version.h> | ||
| 70 | #include <linux/interrupt.h> | 69 | #include <linux/interrupt.h> |
| 71 | #include <linux/module.h> | 70 | #include <linux/module.h> |
| 72 | #include <linux/slab.h> | 71 | #include <linux/slab.h> |