Merge branch 'omap-fixes'

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

diff --git a/arch/arm/plat-omap/include/mach/gpio.h b/arch/arm/plat-omap/include/mach/gpio.h
index 8d9dfe314387b0da08e7d6240724ceae62848afc..2b22a8799bc63eec4ff05266afca49ec8ed6b737 100644 (file)
--- a/arch/arm/plat-omap/include/mach/gpio.h
+++ b/arch/arm/plat-omap/include/mach/gpio.h
@@ -31,7 +31,8 @@
 
 #define OMAP_MPUIO_BASE                        0xfffb5000
 
-#ifdef CONFIG_ARCH_OMAP730
+#if (defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850))
+
 #define OMAP_MPUIO_INPUT_LATCH         0x00
 #define OMAP_MPUIO_OUTPUT              0x02
 #define OMAP_MPUIO_IO_CNTL             0x04