Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[safe/jmp/linux-2.6] / sound / soc / s3c24xx / s3c24xx_simtec.c

diff --git a/sound/soc/s3c24xx/s3c24xx_simtec.c b/sound/soc/s3c24xx/s3c24xx_simtec.c
index 507b2ed..d441c3b 100644 (file)
--- a/sound/soc/s3c24xx/s3c24xx_simtec.c
+++ b/sound/soc/s3c24xx/s3c24xx_simtec.c
@@ -270,7 +270,7 @@ static int attach_gpio_amp(struct device *dev,
                gpio_direction_output(pd->amp_gain[1], 0);
        }
 
-       /* note, curently we assume GPA0 isn't valid amp */
+       /* note, currently we assume GPA0 isn't valid amp */
        if (pdata->amp_gpio > 0) {
                ret = gpio_request(pd->amp_gpio, "gpio-amp");
                if (ret) {