summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-s3c
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-06-22 14:31:57 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-06-22 14:31:57 +0100
commit915166d96f5cab90b6f39f37da1139e5eab516b2 (patch)
treed5746250f994bad7c32c2853e1cc89c9181e1c88 /arch/arm/plat-s3c
parent3eadd3b21cec340dacdc24dd1f9735344290ca62 (diff)
parent49fb88af23f3344ba53d6dbe34ac0b1426d81006 (diff)
downloadblackbird-op-linux-915166d96f5cab90b6f39f37da1139e5eab516b2.tar.gz
blackbird-op-linux-915166d96f5cab90b6f39f37da1139e5eab516b2.zip
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
Diffstat (limited to 'arch/arm/plat-s3c')
-rw-r--r--arch/arm/plat-s3c/gpio-config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-s3c/gpio-config.c b/arch/arm/plat-s3c/gpio-config.c
index 08044dec9731..456969b6fa0d 100644
--- a/arch/arm/plat-s3c/gpio-config.c
+++ b/arch/arm/plat-s3c/gpio-config.c
@@ -119,7 +119,7 @@ int s3c_gpio_setcfg_s3c64xx_4bit(struct s3c_gpio_chip *chip,
unsigned int shift = (off & 7) * 4;
u32 con;
- if (off < 8 && chip->chip.ngpio >= 8)
+ if (off < 8 && chip->chip.ngpio > 8)
reg -= 4;
if (s3c_gpio_is_cfg_special(cfg)) {
OpenPOWER on IntegriCloud