summaryrefslogtreecommitdiffstats
path: root/kernel/drivers/scsi/pcmcia
diff options
context:
space:
mode:
authorJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-04-11 10:41:07 +0300
committerJosé Pekkarinen <jose.pekkarinen@nokia.com>2016-04-13 08:17:18 +0300
commite09b41010ba33a20a87472ee821fa407a5b8da36 (patch)
treed10dc367189862e7ca5c592f033dc3726e1df4e3 /kernel/drivers/scsi/pcmcia
parentf93b97fd65072de626c074dbe099a1fff05ce060 (diff)
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
are taken from kernel.org, and rt patch from the rt wiki download page. During the rebasing, the following patch collided: Force tick interrupt and get rid of softirq magic(I70131fb85). Collisions have been removed because its logic was found on the source already. Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769 Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>
Diffstat (limited to 'kernel/drivers/scsi/pcmcia')
-rw-r--r--kernel/drivers/scsi/pcmcia/nsp_cs.c1
-rw-r--r--kernel/drivers/scsi/pcmcia/qlogic_stub.c1
-rw-r--r--kernel/drivers/scsi/pcmcia/sym53c500_cs.c1
3 files changed, 0 insertions, 3 deletions
diff --git a/kernel/drivers/scsi/pcmcia/nsp_cs.c b/kernel/drivers/scsi/pcmcia/nsp_cs.c
index 1b6c8833a..5fb6eefc6 100644
--- a/kernel/drivers/scsi/pcmcia/nsp_cs.c
+++ b/kernel/drivers/scsi/pcmcia/nsp_cs.c
@@ -86,7 +86,6 @@ static struct scsi_host_template nsp_driver_template = {
.can_queue = 1,
.this_id = NSP_INITIATOR_ID,
.sg_tablesize = SG_ALL,
- .cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING,
};
diff --git a/kernel/drivers/scsi/pcmcia/qlogic_stub.c b/kernel/drivers/scsi/pcmcia/qlogic_stub.c
index bcaf89fe0..c670dc704 100644
--- a/kernel/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/kernel/drivers/scsi/pcmcia/qlogic_stub.c
@@ -72,7 +72,6 @@ static struct scsi_host_template qlogicfas_driver_template = {
.can_queue = 1,
.this_id = -1,
.sg_tablesize = SG_ALL,
- .cmd_per_lun = 1,
.use_clustering = DISABLE_CLUSTERING,
};
diff --git a/kernel/drivers/scsi/pcmcia/sym53c500_cs.c b/kernel/drivers/scsi/pcmcia/sym53c500_cs.c
index 155f95730..20011c8af 100644
--- a/kernel/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/kernel/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -680,7 +680,6 @@ static struct scsi_host_template sym53c500_driver_template = {
.can_queue = 1,
.this_id = 7,
.sg_tablesize = 32,
- .cmd_per_lun = 1,
.use_clustering = ENABLE_CLUSTERING,
.shost_attrs = SYM53C500_shost_attrs
};