diff --git a/[refs] b/[refs]
index 2ea2626235dd..a0ed033d9bdb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df1bac2e2f180752ac3ae04fbc78366720a2074f
+refs/heads/master: a4395612290c7b70041952add7ad75b534c8b40c
diff --git a/trunk/arch/arm/plat-mxc/include/mach/gpio.h b/trunk/arch/arm/plat-mxc/include/mach/gpio.h
index 38ebebd9d3bb..72c3ed1cddd5 100644
--- a/trunk/arch/arm/plat-mxc/include/mach/gpio.h
+++ b/trunk/arch/arm/plat-mxc/include/mach/gpio.h
@@ -34,6 +34,4 @@
 #define gpio_cansleep		__gpio_cansleep
 #define gpio_to_irq		__gpio_to_irq
 
-#define irq_to_gpio(irq)	((irq) - MXC_GPIO_IRQ_START)
-
 #endif
diff --git a/trunk/drivers/gpio/gpio-mxc.c b/trunk/drivers/gpio/gpio-mxc.c
index 64aff20bc620..b588f8a41e60 100644
--- a/trunk/drivers/gpio/gpio-mxc.c
+++ b/trunk/drivers/gpio/gpio-mxc.c
@@ -31,6 +31,8 @@
 #include <linux/of_device.h>
 #include <asm-generic/bug.h>
 
+#define irq_to_gpio(irq)	((irq) - MXC_GPIO_IRQ_START)
+
 enum mxc_gpio_hwtype {
 	IMX1_GPIO,	/* runs on i.mx1 */
 	IMX21_GPIO,	/* runs on i.mx21 and i.mx27 */