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

1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/message/i2o/iop.c b/drivers/message/i2o/iop.c
index 27cf4af0e13d..090d2a3a6548 100644
--- a/drivers/message/i2o/iop.c
+++ b/drivers/message/i2o/iop.c
@@ -29,6 +29,7 @@
 #include <linux/i2o.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
+#include <linux/slab.h>
 #include "core.h"
 
 #define OSM_NAME        "i2o"
@@ -132,7 +133,7 @@ u32 i2o_cntxt_list_add(struct i2o_controller * c, void *ptr)
  *      Removes a previously added pointer from the context list and returns
  *      the matching context id.
  *
- *      Returns context id on succes or 0 on failure.
+ *      Returns context id on success or 0 on failure.
  */
 u32 i2o_cntxt_list_remove(struct i2o_controller * c, void *ptr)
 {
@@ -198,7 +199,7 @@ void *i2o_cntxt_list_get(struct i2o_controller *c, u32 context)
  *      @c: controller to which the context list belong
  *      @ptr: pointer to which the context id should be fetched
  *
- *      Returns context id which matches to the pointer on succes or 0 on
+ *      Returns context id which matches to the pointer on success or 0 on
  *      failure.
  */
 u32 i2o_cntxt_list_get_ptr(struct i2o_controller * c, void *ptr)
@@ -539,7 +540,7 @@ static int i2o_iop_reset(struct i2o_controller *c)
                  * which is indeterminate. We need to wait until the IOP has
                  * rebooted before we can let the system talk to it. We read
                  * the inbound Free_List until a message is available. If we
-                 * can't read one in the given ammount of time, we assume the
+                 * can't read one in the given amount of time, we assume the
                  * IOP could not reboot properly.
                  */
                 osm_debug("%s: Reset in progress, waiting for reboot...\n",