aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_transport_sas.c
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
committerJiri Kosina <jkosina@suse.cz>2009-12-07 12:36:35 -0500
commitd014d043869cdc591f3a33243d3481fa4479c2d0 (patch)
tree63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/scsi/scsi_transport_sas.c
parent6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff)
parent6070d81eb5f2d4943223c96e7609a53cdc984364 (diff)
Merge branch 'for-next' into for-linus
Conflicts: kernel/irq/chip.c
Diffstat (limited to 'drivers/scsi/scsi_transport_sas.c')
-rw-r--r--drivers/scsi/scsi_transport_sas.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index fd47cb1bee1b..f27e52d963d3 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -666,7 +666,7 @@ EXPORT_SYMBOL(sas_phy_add);
666 * 666 *
667 * Note: 667 * Note:
668 * This function must only be called on a PHY that has not 668 * This function must only be called on a PHY that has not
669 * sucessfully been added using sas_phy_add(). 669 * successfully been added using sas_phy_add().
670 */ 670 */
671void sas_phy_free(struct sas_phy *phy) 671void sas_phy_free(struct sas_phy *phy)
672{ 672{
@@ -896,7 +896,7 @@ EXPORT_SYMBOL(sas_port_add);
896 * 896 *
897 * Note: 897 * Note:
898 * This function must only be called on a PORT that has not 898 * This function must only be called on a PORT that has not
899 * sucessfully been added using sas_port_add(). 899 * successfully been added using sas_port_add().
900 */ 900 */
901void sas_port_free(struct sas_port *port) 901void sas_port_free(struct sas_port *port)
902{ 902{
@@ -1476,7 +1476,7 @@ EXPORT_SYMBOL(sas_rphy_add);
1476 * 1476 *
1477 * Note: 1477 * Note:
1478 * This function must only be called on a remote 1478 * This function must only be called on a remote
1479 * PHY that has not sucessfully been added using 1479 * PHY that has not successfully been added using
1480 * sas_rphy_add() (or has been sas_rphy_remove()'d) 1480 * sas_rphy_add() (or has been sas_rphy_remove()'d)
1481 */ 1481 */
1482void sas_rphy_free(struct sas_rphy *rphy) 1482void sas_rphy_free(struct sas_rphy *rphy)