Merge branch 'master'

[linux-2.6-omap-h63xx.git] / include / asm-arm / arch-omap / gpio.h

diff --git a/include/asm-arm/arch-omap/gpio.h b/include/asm-arm/arch-omap/gpio.h
index 74cb2b93b70024f39bf135781e0afde230153af5..1b3885741ac1ca05f83cdbf9a7b8090c7cd11c13 100644 (file)
--- a/include/asm-arm/arch-omap/gpio.h
+++ b/include/asm-arm/arch-omap/gpio.h
@@ -67,7 +67,7 @@
 
 #define OMAP_GPIO_IRQ(nr)      (OMAP_GPIO_IS_MPUIO(nr) ? \
                                 IH_MPUIO_BASE + ((nr) & 0x0f) : \
-                                IH_GPIO_BASE + ((nr) & 0x3f))
+                                IH_GPIO_BASE + (nr))
 
 extern int omap_gpio_init(void);       /* Call from board init only */
 extern int omap_request_gpio(int gpio);