diff options
| author | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-01-24 16:17:06 -0500 |
| commit | e92427b289d252cfbd4cb5282d92f4ce1a5bb1fb (patch) | |
| tree | 6d30e5e7b7f8e9aaa51d43b7128ac56860fa03bb /drivers/scsi/scsi_netlink.c | |
| parent | c506653d35249bb4738bb139c24362e1ae724bc1 (diff) | |
| parent | ec30f343d61391ab23705e50a525da1d55395780 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/scsi/scsi_netlink.c')
| -rw-r--r-- | drivers/scsi/scsi_netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c index d53e6503c6d5..a2ed201885ae 100644 --- a/drivers/scsi/scsi_netlink.c +++ b/drivers/scsi/scsi_netlink.c | |||
| @@ -477,7 +477,7 @@ EXPORT_SYMBOL_GPL(scsi_nl_remove_driver); | |||
| 477 | 477 | ||
| 478 | 478 | ||
| 479 | /** | 479 | /** |
| 480 | * scsi_netlink_init - Called by SCSI subsystem to intialize | 480 | * scsi_netlink_init - Called by SCSI subsystem to initialize |
| 481 | * the SCSI transport netlink interface | 481 | * the SCSI transport netlink interface |
| 482 | * | 482 | * |
| 483 | **/ | 483 | **/ |