Merge branch 'fortglx/39/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux...

[pandora-kernel.git] / drivers / media / rc / rc-main.c

diff --git a/drivers/media/rc/rc-main.c b/drivers/media/rc/rc-main.c
index 5ac1baf..f53f9c6 100644 (file)
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
@@ -255,7 +255,7 @@ static unsigned int ir_update_mapping(struct rc_dev *dev,
  * @rc_map:    scancode table to be searched
  * @scancode:  the desired scancode
  * @resize:    controls whether we allowed to resize the table to
- *             accomodate not yet present scancodes
+ *             accommodate not yet present scancodes
  * @return:    index of the mapping containing scancode in question
  *             or -1U in case of failure.
  *
@@ -1037,7 +1037,7 @@ int rc_register_device(struct rc_dev *dev)
                goto out_table;
 
        /*
-        * Default delay of 250ms is too short for some protocols, expecially
+        * Default delay of 250ms is too short for some protocols, especially
         * since the timeout is currently set to 250ms. Increase it to 500ms,
         * to avoid wrong repetition of the keycodes. Note that this must be
         * set after the call to input_register_device().