diff options
author | Henne <henne@nachtwindheim.de> | 2006-10-04 10:22:09 +0200 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-10-04 13:10:52 -0500 |
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 7b3bd34faf4..b20b37661d6 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) */ 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/drivers/scsi/dpti.h b/drivers/scsi/dpti.h index 2ad2a89b5db..28998326492 100644 --- a/drivers/scsi/dpti.h +++ b/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/drivers/scsi/hosts.h b/drivers/scsi/hosts.h deleted file mode 100644 index c27264bed5d..00000000000 --- a/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/drivers/scsi/ips.c b/drivers/scsi/ips.c index 95b7536626f..9a9ab297cf1 100644 --- a/drivers/scsi/ips.c +++ b/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/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c index 0d4c04e1f3d..053303d3611 100644 --- a/drivers/scsi/pcmcia/nsp_cs.c +++ b/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, |