From: Andrew Morton <akpm@osdl.org>

drivers/scsi/aic7xxx/aic79xx_osm.c: In function 'ahd_linux_handle_scsi_status':
drivers/scsi/aic7xxx/aic79xx_osm.c:1826: warning: comparison of distinct pointer types lacks a cast

Cc: Amol Lad <amol@verismonetworks.com>
Cc: James Bottomley <James.Bottomley@steeleye.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/scsi/aic7xxx/aic79xx_osm.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletion(-)

diff -puN drivers/scsi/aic7xxx/aic79xx_osm.c~drivers-scsi-handcrafted-min-max-macro-removal-fix drivers/scsi/aic7xxx/aic79xx_osm.c
--- a/drivers/scsi/aic7xxx/aic79xx_osm.c~drivers-scsi-handcrafted-min-max-macro-removal-fix
+++ a/drivers/scsi/aic7xxx/aic79xx_osm.c
@@ -1823,7 +1823,8 @@ ahd_linux_handle_scsi_status(struct ahd_
 				 */
 				siu = (struct scsi_status_iu_header *)
 				    scb->sense_data;
-				sense_size = min(scsi_4btoul(siu->sense_length),
+				sense_size = min_t(size_t,
+						scsi_4btoul(siu->sense_length),
 						sizeof(cmd->sense_buffer));
 				sense_offset = SIU_SENSE_OFFSET(siu);
 			}
_