aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi/isci/remote_node_context.h
diff options
context:
space:
mode:
authorJames Bottomley <JBottomley@Parallels.com>2012-09-13 09:26:10 +0100
committerJames Bottomley <JBottomley@Parallels.com>2012-09-13 09:26:10 +0100
commit1c4cf1d5845b59cdcbfad8e67272cf5b219ab062 (patch)
treec4ecdf7a4199bc20adcef950e9d5a38b9a6dc392 /drivers/scsi/isci/remote_node_context.h
parent0bd1189e239c76eb3a50e458548fbe7e4a5dfff1 (diff)
parent6734092e66011def7875bd67beef889d0fee1cc9 (diff)
downloadlinux-linaro-stable-1c4cf1d5845b59cdcbfad8e67272cf5b219ab062.tar.gz
Merge tag 'isci-for-3.6' into for-next
isci update for 3.6 1/ Fix the workaround for drives that have a slow response to COMSAS. Drives with this problem intermittently take a long time to be identified, or fail to be identified altogether. 2/ A minor fix for the efi variable code failure path 3/ A handful of smatch fixups from Dan Carpenter
Diffstat (limited to 'drivers/scsi/isci/remote_node_context.h')
-rw-r--r--drivers/scsi/isci/remote_node_context.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/isci/remote_node_context.h b/drivers/scsi/isci/remote_node_context.h
index a703b9ce0c2c..c7ee81d01125 100644
--- a/drivers/scsi/isci/remote_node_context.h
+++ b/drivers/scsi/isci/remote_node_context.h
@@ -212,7 +212,7 @@ enum sci_status sci_remote_node_context_destruct(struct sci_remote_node_context
scics_sds_remote_node_context_callback callback,
void *callback_parameter);
enum sci_status sci_remote_node_context_suspend(struct sci_remote_node_context *sci_rnc,
- u32 suspend_type,
+ enum sci_remote_node_suspension_reasons reason,
u32 suspension_code);
enum sci_status sci_remote_node_context_resume(struct sci_remote_node_context *sci_rnc,
scics_sds_remote_node_context_callback cb_fn,