diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-13 10:47:14 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-13 10:47:14 -0700 |
| commit | cc4238bd1639332a1126e2cf677b5656e28bdc02 (patch) | |
| tree | 4c1196469ca30b9a523f8fa42762e78987972a14 /include | |
| parent | 80a0d644d37296d7cac1a4956cb4e916770083e0 (diff) | |
| parent | 580b71e9f64e0e6e9063466fce4564c56156695d (diff) | |
Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
Pull SCSI fixes from James Bottomley:
"A tiny update: one patch corrects a Kconfig problem with the shift of
the SAS SMP code to BSG and the other removes a vestige of user space
target mode"
* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
scsi: scsi_transport_sas: select BLK_DEV_BSGLIB
scsi: Remove Scsi_Host.uspace_req_q
Diffstat (limited to 'include')
| -rw-r--r-- | include/scsi/scsi_host.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index afb04811b7b9..0a804b1a4726 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -691,12 +691,6 @@ struct Scsi_Host { unsigned int prot_capabilities; unsigned char prot_guard_type; - /* - * q used for scsi_tgt msgs, async events or any other requests that - * need to be processed in userspace - */ - struct request_queue *uspace_req_q; - /* legacy crap */ unsigned long base; unsigned long io_port; |