summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_scan.c
diff options
context:
space:
mode:
authorSteve French <sfrench@us.ibm.com>2008-03-04 04:22:00 +0000
committerSteve French <sfrench@us.ibm.com>2008-03-04 04:22:00 +0000
commit966ea8c4b74aa6fde2d58c50a904619fd849ae93 (patch)
tree15f02bbcf6112575dbec30c3f7603a393b4dee3a /drivers/scsi/scsi_scan.c
parent41c5ae6898454277ec88e8e7278c8c58026363a3 (diff)
parent976dde010e513a9c7c3117a32b7b015f84b37430 (diff)
downloadlinux-966ea8c4b74aa6fde2d58c50a904619fd849ae93.tar.gz
linux-966ea8c4b74aa6fde2d58c50a904619fd849ae93.tar.bz2
linux-966ea8c4b74aa6fde2d58c50a904619fd849ae93.zip
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/scsi/scsi_scan.c')
-rw-r--r--drivers/scsi/scsi_scan.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 1dc165ad17fb..e67c14e31bab 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1577,8 +1577,7 @@ static void __scsi_scan_target(struct device *parent, unsigned int channel,
}
/**
- * scsi_scan_target - scan a target id, possibly including all LUNs on the
- * target.
+ * scsi_scan_target - scan a target id, possibly including all LUNs on the target.
* @parent: host to scan
* @channel: channel to scan
* @id: target id to scan