---

yaml --- r: 272515 b: refs/heads/master c: a439561 h: refs/heads/master i: 272513: f0b322b 272511: 329fbac v: v3
git-mirror · Aug 17, 2011 · b670782 · b670782
1 parent 52e8b47
commit b670782
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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 */