From 34f620155f50082d2711793aaa5d020f1e71590a Mon Sep 17 00:00:00 2001
From: Henne <henne@nachtwindheim.de>
Date: Wed, 4 Oct 2006 10:22:09 +0200
Subject: [PATCH] --- yaml --- r: 38978 b: refs/heads/master c:
 de77aaff5f0178f44867f131deb5e2cb1610fe6b h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/scsi/dpt_i2o.c       | 2 +-
 trunk/drivers/scsi/dpti.h          | 2 +-
 trunk/drivers/scsi/hosts.h         | 2 --
 trunk/drivers/scsi/ips.c           | 6 ------
 trunk/drivers/scsi/pcmcia/nsp_cs.c | 1 -
 6 files changed, 3 insertions(+), 12 deletions(-)
 delete mode 100644 trunk/drivers/scsi/hosts.h

diff --git a/[refs] b/[refs]
index 4066f46556c4..47c4dfa92244 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c1278289363d9976c81b3b2512621fe152280e82
+refs/heads/master: de77aaff5f0178f44867f131deb5e2cb1610fe6b
diff --git a/trunk/drivers/scsi/dpt_i2o.c b/trunk/drivers/scsi/dpt_i2o.c
index 7b3bd34faf47..b20b37661d6f 100644
--- a/trunk/drivers/scsi/dpt_i2o.c
+++ b/trunk/drivers/scsi/dpt_i2o.c
@@ -2212,7 +2212,7 @@ static s32 adpt_scsi_register(adpt_hba* pHba,struct scsi_host_template * sht)
 	 */
 	host->io_port = 0;
 	host->n_io_port = 0;
-				/* see comments in hosts.h */
+				/* see comments in scsi_host.h */
 	host->max_id = 16;
 	host->max_lun = 256;
 	host->max_channel = pHba->top_scsi_channel + 1;
diff --git a/trunk/drivers/scsi/dpti.h b/trunk/drivers/scsi/dpti.h
index 2ad2a89b5db4..289983264929 100644
--- a/trunk/drivers/scsi/dpti.h
+++ b/trunk/drivers/scsi/dpti.h
@@ -44,7 +44,7 @@ static int adpt_device_reset(struct scsi_cmnd* cmd);
 
 
 /*
- * struct scsi_host_template (see hosts.h)
+ * struct scsi_host_template (see scsi/scsi_host.h)
  */
 
 #define DPT_DRIVER_NAME	"Adaptec I2O RAID"
diff --git a/trunk/drivers/scsi/hosts.h b/trunk/drivers/scsi/hosts.h
deleted file mode 100644
index c27264bed5d4..000000000000
--- a/trunk/drivers/scsi/hosts.h
+++ /dev/null
@@ -1,2 +0,0 @@
-#warning "This file is obsolete, please use <scsi/scsi_host.h> instead"
-#include <scsi/scsi_host.h>
diff --git a/trunk/drivers/scsi/ips.c b/trunk/drivers/scsi/ips.c
index 95b7536626f9..9a9ab297cf17 100644
--- a/trunk/drivers/scsi/ips.c
+++ b/trunk/drivers/scsi/ips.c
@@ -182,14 +182,8 @@
 #include <linux/dma-mapping.h>
 
 #include <scsi/sg.h>
-
 #include "scsi.h"
-
-#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0)
-#include "hosts.h"
-#else
 #include <scsi/scsi_host.h>
-#endif
 
 #include "ips.h"
 
diff --git a/trunk/drivers/scsi/pcmcia/nsp_cs.c b/trunk/drivers/scsi/pcmcia/nsp_cs.c
index 0d4c04e1f3de..053303d36118 100644
--- a/trunk/drivers/scsi/pcmcia/nsp_cs.c
+++ b/trunk/drivers/scsi/pcmcia/nsp_cs.c
@@ -80,7 +80,6 @@ static int       free_ports = 0;
 module_param(free_ports, bool, 0);
 MODULE_PARM_DESC(free_ports, "Release IO ports after configuration? (default: 0 (=no))");
 
-/* /usr/src/linux/drivers/scsi/hosts.h */
 static struct scsi_host_template nsp_driver_template = {
 	.proc_name	         = "nsp_cs",
 	.proc_info		 = nsp_proc_info,