From 1aed76677c38407721821043fcb641e7867a865b Mon Sep 17 00:00:00 2001
From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Date: Tue, 23 Oct 2012 18:28:00 +0200
Subject: [PATCH] --- yaml --- r: 336383 b: refs/heads/master c:
 525fae21317658ae556ca850f3004319004641d1 h: refs/heads/master i:   336381:
 c645bed07a5cfc9b3477919b152f1de6c1859723   336379:
 7f4b33e658eaaa70958e04b5f1603de6a69564a2   336375:
 6557d43418941eb9040bafc937c322a0eb216667   336367:
 ca37a41c23c5290bfd085d236e8e546b044e8831   336351:
 ae2cd34de973d1c8019d6c4580da52fa872cc6d9   336319:
 bca3281621ff65c4dd8e7a9a59a4eeb6b9d3336c   336255:
 0b2052c119b0e26f20eb4b049edc8d626f485bc2   336127:
 1115b21ead35f180bc63879c3855ad05f04737bc   335871:
 3e43c2f1c537ec292c9eb6ef6ca10dd05db0394f v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/pinctrl/pinctrl-at91.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5b9502b71af3..995ed28dc63c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae0407e137ebea3c573b47246b3ca0e7076b07e8
+refs/heads/master: 525fae21317658ae556ca850f3004319004641d1
diff --git a/trunk/drivers/pinctrl/pinctrl-at91.c b/trunk/drivers/pinctrl/pinctrl-at91.c
index 01bf92459fdc..f10fad2079c5 100644
--- a/trunk/drivers/pinctrl/pinctrl-at91.c
+++ b/trunk/drivers/pinctrl/pinctrl-at91.c
@@ -58,7 +58,7 @@ static struct at91_gpio_chip *gpio_chips[MAX_GPIO_BANKS];
 
 static int gpio_banks;
 
-#define PULL_UP		(0 << 1)
+#define PULL_UP		(1 << 0)
 #define MULTI_DRIVE	(1 << 1)
 
 /**