Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus

[sfrench/cifs-2.6.git] / arch / arm / mach-u300 / gpio.c

diff --git a/arch/arm/mach-u300/gpio.c b/arch/arm/mach-u300/gpio.c
index 5f61fd45a0c8a1dee47baa305ca3aa49d07fac01..d92790140fe53852bd4e571ed29fe95f490e8e77 100644 (file)
--- a/arch/arm/mach-u300/gpio.c
+++ b/arch/arm/mach-u300/gpio.c
@@ -523,7 +523,7 @@ static void gpio_set_initial_values(void)
 
        /*
         * Put all pins that are set to either 'GPIO_OUT' or 'GPIO_NOT_USED'
-        * to output and 'GPIO_IN' to input for each port. And initalize
+        * to output and 'GPIO_IN' to input for each port. And initialize
         * default value on outputs.
         */
        for (i = 0; i < U300_GPIO_NUM_PORTS; i++) {