summaryrefslogtreecommitdiff
path: root/include/scsi/libsas.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-12-11 17:12:17 -0800
committerDavid S. Miller <davem@davemloft.net>2009-12-11 17:12:17 -0800
commit501706565b2d4d2d40d0d301d5411ede099b8a6f (patch)
tree142a18bf1f1e74a09dbfa27540b893ade0fd797d /include/scsi/libsas.h
parente93737b0f0159a61772894943199fd3b6f315641 (diff)
parent2fe77b81c77eed92c4c0439f74c8148a295b4a86 (diff)
downloadlinux-3.10-501706565b2d4d2d40d0d301d5411ede099b8a6f.tar.gz
linux-3.10-501706565b2d4d2d40d0d301d5411ede099b8a6f.tar.bz2
linux-3.10-501706565b2d4d2d40d0d301d5411ede099b8a6f.zip
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts: include/net/tcp.h
Diffstat (limited to 'include/scsi/libsas.h')
-rw-r--r--include/scsi/libsas.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/scsi/libsas.h b/include/scsi/libsas.h
index e78d3b62d8e..9eaa3f05f95 100644
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
@@ -634,7 +634,8 @@ extern int sas_target_alloc(struct scsi_target *);
extern int sas_slave_alloc(struct scsi_device *);
extern int sas_slave_configure(struct scsi_device *);
extern void sas_slave_destroy(struct scsi_device *);
-extern int sas_change_queue_depth(struct scsi_device *, int new_depth);
+extern int sas_change_queue_depth(struct scsi_device *, int new_depth,
+ int reason);
extern int sas_change_queue_type(struct scsi_device *, int qt);
extern int sas_bios_param(struct scsi_device *,
struct block_device *,