Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

[~andy/linux] / drivers / scsi / scsi_netlink.c

diff --git a/drivers/scsi/scsi_netlink.c b/drivers/scsi/scsi_netlink.c
index a2ed201885ae3b453d657509ce6f774981098815..26a8a45584ef844f02c9b31528918cc129e7c775 100644 (file)
--- a/drivers/scsi/scsi_netlink.c
+++ b/drivers/scsi/scsi_netlink.c
@@ -499,7 +499,7 @@ scsi_netlink_init(void)
                                SCSI_NL_GRP_CNT, scsi_nl_rcv_msg, NULL,
                                THIS_MODULE);
        if (!scsi_nl_sock) {
-               printk(KERN_ERR "%s: register of recieve handler failed\n",
+               printk(KERN_ERR "%s: register of receive handler failed\n",
                                __func__);
                netlink_unregister_notifier(&scsi_netlink_notifier);
                return;