From c6808990170a944a161147032106a1db6d4df883 Mon Sep 17 00:00:00 2001
From: Linus Walleij <linus.walleij@linaro.org>
Date: Fri, 28 Oct 2011 15:25:01 +0100
Subject: [PATCH] --- yaml --- r: 274131 b: refs/heads/master c:
 4fc7ae3c849a5a15965c1d41b59b0a606119e71a h: refs/heads/master i:   274129:
 a165bbd72385b86631539d188df71382c98cddae   274127:
 8e52c0c8fa12033df7b0fe09c2adebddaa5efe59 v: v3

---
 [refs]                                          | 2 +-
 trunk/arch/arm/mach-davinci/include/mach/gpio.h | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5cadec65caca..59e6a236eabd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5895a9c0818d3c800ac8e7d3d3827cc89df2bdbf
+refs/heads/master: 4fc7ae3c849a5a15965c1d41b59b0a606119e71a
diff --git a/trunk/arch/arm/mach-davinci/include/mach/gpio.h b/trunk/arch/arm/mach-davinci/include/mach/gpio.h
index fbaae4772b91..960e9de47e1e 100644
--- a/trunk/arch/arm/mach-davinci/include/mach/gpio.h
+++ b/trunk/arch/arm/mach-davinci/include/mach/gpio.h
@@ -15,6 +15,8 @@
 
 #include <asm-generic/gpio.h>
 
+#define __ARM_GPIOLIB_COMPLEX
+
 /* The inline versions use the static inlines in the driver header */
 #include "gpio-davinci.h"