aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2010-02-23 23:37:22 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-02-24 21:10:07 +0000
commitfcfadcaa57be0711ca80e3898243388f4d19928f (patch)
tree4df86b218b968ce3d2efc22a5c015a994d26ff46
parentARM: 5940/2: ARM: MMCI: remove custom DBG macro and printk (diff)
downloadlinux-dev-fcfadcaa57be0711ca80e3898243388f4d19928f.tar.xz
linux-dev-fcfadcaa57be0711ca80e3898243388f4d19928f.zip
ARM: 5956/1: misplaced parentheses
The parentheses appear misplaced. Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Acked-by: Linus Walleij <linus.walleij@stericsson.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
-rw-r--r--arch/arm/mach-u300/gpio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/gpio.c b/arch/arm/mach-u300/gpio.c
index 0b35826b7d1d..5f61fd45a0c8 100644
--- a/arch/arm/mach-u300/gpio.c
+++ b/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);