diff options
author | Henne <henne@nachtwindheim.de> | 2006-10-04 04:22:09 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-10-04 14:10:52 -0400 |
commit | de77aaff5f0178f44867f131deb5e2cb1610fe6b (patch) | |
tree | 85d59cf0906eb420b03bf9625a3305cb4e9285fd /drivers | |
parent | c1278289363d9976c81b3b2512621fe152280e82 (diff) |
[SCSI] scsi: remove hosts.h
Remove the obsolete hosts.h file under drivers/scsi.
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/scsi/dpt_i2o.c | 2 | ||||
-rw-r--r-- | drivers/scsi/dpti.h | 2 | ||||
-rw-r--r-- | drivers/scsi/hosts.h | 2 | ||||
-rw-r--r-- | drivers/scsi/ips.c | 6 | ||||
-rw-r--r-- | drivers/scsi/pcmcia/nsp_cs.c | 1 |
5 files changed, 2 insertions, 11 deletions
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c index 7b3bd34faf47..b20b37661d6f 100644 --- a/drivers/scsi/dpt_i2o.c +++ b/drivers/scsi/dpt_i2o.c | |||
@@ -2212,7 +2212,7 @@ static s32 adpt_scsi_register(adpt_hba* pHba,struct scsi_host_template * sht) | |||
2212 | */ | 2212 | */ |
2213 | host->io_port = 0; | 2213 | host->io_port = 0; |
2214 | host->n_io_port = 0; | 2214 | host->n_io_port = 0; |
2215 | /* see comments in hosts.h */ | 2215 | /* see comments in scsi_host.h */ |
2216 | host->max_id = 16; | 2216 | host->max_id = 16; |
2217 | host->max_lun = 256; | 2217 | host->max_lun = 256; |
2218 | host->max_channel = pHba->top_scsi_channel + 1; | 2218 | host->max_channel = pHba->top_scsi_channel + 1; |
diff --git a/drivers/scsi/dpti.h b/drivers/scsi/dpti.h index 2ad2a89b5db4..289983264929 100644 --- a/drivers/scsi/dpti.h +++ b/drivers/scsi/dpti.h | |||
@@ -44,7 +44,7 @@ static int adpt_device_reset(struct scsi_cmnd* cmd); | |||
44 | 44 | ||
45 | 45 | ||
46 | /* | 46 | /* |
47 | * struct scsi_host_template (see hosts.h) | 47 | * struct scsi_host_template (see scsi/scsi_host.h) |
48 | */ | 48 | */ |
49 | 49 | ||
50 | #define DPT_DRIVER_NAME "Adaptec I2O RAID" | 50 | #define DPT_DRIVER_NAME "Adaptec I2O RAID" |
diff --git a/drivers/scsi/hosts.h b/drivers/scsi/hosts.h deleted file mode 100644 index c27264bed5d4..000000000000 --- a/drivers/scsi/hosts.h +++ /dev/null | |||
@@ -1,2 +0,0 @@ | |||
1 | #warning "This file is obsolete, please use <scsi/scsi_host.h> instead" | ||
2 | #include <scsi/scsi_host.h> | ||
diff --git a/drivers/scsi/ips.c b/drivers/scsi/ips.c index 95b7536626f9..9a9ab297cf17 100644 --- a/drivers/scsi/ips.c +++ b/drivers/scsi/ips.c | |||
@@ -182,14 +182,8 @@ | |||
182 | #include <linux/dma-mapping.h> | 182 | #include <linux/dma-mapping.h> |
183 | 183 | ||
184 | #include <scsi/sg.h> | 184 | #include <scsi/sg.h> |
185 | |||
186 | #include "scsi.h" | 185 | #include "scsi.h" |
187 | |||
188 | #if LINUX_VERSION_CODE <= KERNEL_VERSION(2,5,0) | ||
189 | #include "hosts.h" | ||
190 | #else | ||
191 | #include <scsi/scsi_host.h> | 186 | #include <scsi/scsi_host.h> |
192 | #endif | ||
193 | 187 | ||
194 | #include "ips.h" | 188 | #include "ips.h" |
195 | 189 | ||
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index 0d4c04e1f3de..053303d36118 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/drivers/scsi/pcmcia/nsp_cs.c | |||
@@ -80,7 +80,6 @@ static int free_ports = 0; | |||
80 | module_param(free_ports, bool, 0); | 80 | module_param(free_ports, bool, 0); |
81 | MODULE_PARM_DESC(free_ports, "Release IO ports after configuration? (default: 0 (=no))"); | 81 | MODULE_PARM_DESC(free_ports, "Release IO ports after configuration? (default: 0 (=no))"); |
82 | 82 | ||
83 | /* /usr/src/linux/drivers/scsi/hosts.h */ | ||
84 | static struct scsi_host_template nsp_driver_template = { | 83 | static struct scsi_host_template nsp_driver_template = { |
85 | .proc_name = "nsp_cs", | 84 | .proc_name = "nsp_cs", |
86 | .proc_info = nsp_proc_info, | 85 | .proc_info = nsp_proc_info, |