Merge commit 'v2.6.39-rc3' into for-2.6.39

[pandora-kernel.git] / drivers / char / nwbutton.c

diff --git a/drivers/char/nwbutton.c b/drivers/char/nwbutton.c
index 8994ce3..04a480f 100644 (file)
--- a/drivers/char/nwbutton.c
+++ b/drivers/char/nwbutton.c
@@ -75,7 +75,7 @@ int button_add_callback (void (*callback) (void), int count)
  * with -EINVAL. If there is more than one entry with the same address,
  * because it searches the list from end to beginning, it will unregister the
  * last one to be registered first (FILO- First In Last Out).
- * Note that this is not neccessarily true if the entries are not submitted
+ * Note that this is not necessarily true if the entries are not submitted
  * at the same time, because another driver could have unregistered a callback
  * between the submissions creating a gap earlier in the list, which would
  * be filled first at submission time.