From c823d7e47eaeef617214614ae6f8f659182b1b36 Mon Sep 17 00:00:00 2001
From: Roel Kluin <roel.kluin@gmail.com>
Date: Tue, 23 Feb 2010 23:37:22 +0100
Subject: [PATCH] --- yaml --- r: 182991 b: refs/heads/master c:
 fcfadcaa57be0711ca80e3898243388f4d19928f h: refs/heads/master i:   182989:
 6178ef8e5a6de4b27850ccd95f8096af544f107d   182987:
 32561c24a607c1f5f8eca48ea4122bfd8c8054fe   182983:
 e150adbc93305b76df81031b5a00f235dc8cf048   182975:
 2e183ab2abcf399ce6c37026bce7659a9e874cd9 v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/mach-u300/gpio.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 1daf5c0283cb..eaaf69fd548a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 64de028948f449af17cf387f45a45f36ffd3c960
+refs/heads/master: fcfadcaa57be0711ca80e3898243388f4d19928f
diff --git a/trunk/arch/arm/mach-u300/gpio.c b/trunk/arch/arm/mach-u300/gpio.c
index 0b35826b7d1d..5f61fd45a0c8 100644
--- a/trunk/arch/arm/mach-u300/gpio.c
+++ b/trunk/arch/arm/mach-u300/gpio.c
@@ -546,7 +546,7 @@ static void gpio_set_initial_values(void)
 	for (i = 0; i < U300_GPIO_MAX; i++) {
 		val = 0;
 		for (j = 0; j < 8; j++)
-			val |= (u32)((u300_gpio_config[i][j].pull_up == DISABLE_PULL_UP)) << j;
+			val |= (u32)((u300_gpio_config[i][j].pull_up == DISABLE_PULL_UP) << j);
 		local_irq_save(flags);
 		writel(val, virtbase + U300_GPIO_PXPER + i * U300_GPIO_PORTX_SPACING);
 		local_irq_restore(flags);