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

[pandora-kernel.git] / drivers / mfd / twl6030-irq.c

diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index fa93705..dfbae34 100644 (file)
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -229,7 +229,7 @@ int twl6030_mmc_card_detect_config(void)
        twl6030_interrupt_unmask(TWL6030_MMCDETECT_INT_MASK,
                                                REG_INT_MSK_STS_B);
        /*
-        * Intially Configuring MMC_CTRL for receving interrupts &
+        * Initially Configuring MMC_CTRL for receiving interrupts &
         * Card status on TWL6030 for MMC1
         */
        ret = twl_i2c_read_u8(TWL6030_MODULE_ID0, &reg_val, TWL6030_MMCCTRL);
@@ -275,7 +275,7 @@ int twl6030_mmc_card_detect(struct device *dev, int slot)
                /* TWL6030 provide's Card detect support for
                 * only MMC1 controller.
                 */
-               pr_err("Unkown MMC controller %d in %s\n", pdev->id, __func__);
+               pr_err("Unknown MMC controller %d in %s\n", pdev->id, __func__);
                return ret;
        }
        /*