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"