Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/scsi/nsp32.c b/drivers/scsi/nsp32.c
index 2be7d5b018d2..4c1e54545200 100644
--- a/drivers/scsi/nsp32.c
+++ b/drivers/scsi/nsp32.c
@@ -26,7 +26,6 @@
 #include <linux/module.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/slab.h>
 #include <linux/string.h>
 #include <linux/timer.h>
 #include <linux/ioport.h>
@@ -1419,7 +1418,7 @@ static irqreturn_t do_nsp32_isr(int irq, void *dev_id)
                 nsp32_msg(KERN_ERR, "Received unexpected BMCNTERR IRQ! ");
                 /*
                  * TODO: To be implemented improving bus master
-                 * transfer reliablity when BMCNTERR is occurred in
+                 * transfer reliability when BMCNTERR is occurred in
                  * AutoSCSI phase described in specification.
                  */
         }