diff --git a/[refs] b/[refs]
index 72cf98c4fcd0..2836795f39c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd51d0edecc37f1061a5091450e6c7e2a8a16d68
+refs/heads/master: e19e881fcbd08bac0e6c9187ade8e3802d8334df
diff --git a/trunk/arch/arm/mach-tegra/include/mach/gpio.h b/trunk/arch/arm/mach-tegra/include/mach/gpio.h
index e31f486d69a2..12a7cf6874cd 100644
--- a/trunk/arch/arm/mach-tegra/include/mach/gpio.h
+++ b/trunk/arch/arm/mach-tegra/include/mach/gpio.h
@@ -31,7 +31,7 @@
 #define gpio_cansleep		__gpio_cansleep
 
 #define TEGRA_GPIO_TO_IRQ(gpio) (INT_GPIO_BASE + (gpio))
-#define TEGRA_IRQ_TO_GPIO(irq) ((gpio) - INT_GPIO_BASE)
+#define TEGRA_IRQ_TO_GPIO(irq) ((irq) - INT_GPIO_BASE)
 
 static inline int gpio_to_irq(unsigned int gpio)
 {