Merge branches 'release' and 'gpe-ack' into release

[linux-2.6-omap-h63xx.git] / drivers / scsi / aic7xxx / aic79xx_osm.h

diff --git a/drivers/scsi/aic7xxx/aic79xx_osm.h b/drivers/scsi/aic7xxx/aic79xx_osm.h
index 9218f29314fa0edd69f8f2ac449a9463a31e8f3e..853998be1474f4059deb2251bef1ec7bb10a182c 100644 (file)
--- a/drivers/scsi/aic7xxx/aic79xx_osm.h
+++ b/drivers/scsi/aic7xxx/aic79xx_osm.h
@@ -47,7 +47,6 @@
 #include <linux/delay.h>
 #include <linux/ioport.h>
 #include <linux/pci.h>
-#include <linux/smp_lock.h>
 #include <linux/interrupt.h>
 #include <linux/module.h>
 #include <linux/slab.h>
@@ -782,7 +781,7 @@ int ahd_get_transfer_dir(struct scb *scb)
 static __inline
 void ahd_set_residual(struct scb *scb, u_long resid)
 {
-       scb->io_ctx->resid = resid;
+       scsi_set_resid(scb->io_ctx, resid);
 }
 
 static __inline
@@ -794,7 +793,7 @@ void ahd_set_sense_residual(struct scb *scb, u_long resid)
 static __inline
 u_long ahd_get_residual(struct scb *scb)
 {
-       return (scb->io_ctx->resid);
+       return scsi_get_resid(scb->io_ctx);
 }
 
 static __inline