Merge branches 'x86-fixes-for-linus', 'sched-fixes-for-linus', 'timers-fixes-for...

[pandora-kernel.git] / drivers / mfd / ab8500-gpadc.c

diff --git a/drivers/mfd/ab8500-gpadc.c b/drivers/mfd/ab8500-gpadc.c
index bc93b2e..6421ad1 100644 (file)
--- a/drivers/mfd/ab8500-gpadc.c
+++ b/drivers/mfd/ab8500-gpadc.c
@@ -314,7 +314,7 @@ int ab8500_gpadc_convert(struct ab8500_gpadc *gpadc, u8 input)
        /* wait for completion of conversion */
        if (!wait_for_completion_timeout(&gpadc->ab8500_gpadc_complete, 2*HZ)) {
                dev_err(gpadc->dev,
-                       "timeout: didnt recieve GPADC conversion interrupt\n");
+                       "timeout: didn't receive GPADC conversion interrupt\n");
                ret = -EINVAL;
                goto out;
        }