Merge raven.il.steeleye.com:/home/jejb/BK/scsi-aic-2.5

into raven.il.steeleye.com:/home/jejb/BK/scsi-misc-2.5

drivers/scsi/dc395x.c

@@ -51,6 +51,7 @@
 #include <linux/delay.h>
 #include <linux/ctype.h>
 #include <linux/blk.h>
+#include <asm/io.h>
 #include "scsi.h"
 #include "hosts.h"
 #include "dc395x.h"

drivers/scsi/ncr53c8xx.c

@@ -9466,7 +9466,7 @@ static Scsi_Host_Template driver_template =  {
 	.release		= ncr53c8xx_release,
 #endif
 #ifdef SCSI_NCR_PROC_INFO_SUPPORT
-	.proc_info		= ncr53c8xx_proc_info;
+	.proc_info		= ncr53c8xx_proc_info,
 #endif
 	.info			= ncr53c8xx_info,
 	.queuecommand		= ncr53c8xx_queue_command,

drivers/scsi/sim710.c

@@ -155,7 +155,7 @@ sim710_probe_common(struct device *dev, unsigned long base_addr,
 static __devexit int
 sim710_device_remove(struct device *dev)
 {
-	struct Scsi_Host *host = to_scsi_host(dev);
+	struct Scsi_Host *host = dev_to_shost(dev);
 	struct NCR_700_Host_Parameters *hostdata =
 		(struct NCR_700_Host_Parameters *)host->hostdata[0];