Index: u-boot.git/board/cm_t35/leds.c
===================================================================
--- u-boot.git.orig/board/cm_t35/leds.c
+++ u-boot.git/board/cm_t35/leds.c
@@ -20,7 +20,7 @@
  */
 #include <common.h>
 #include <status_led.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 
 static unsigned int leds[] = { GREEN_LED_GPIO };
 
Index: u-boot.git/board/comelit/dig297/dig297.c
===================================================================
--- u-boot.git.orig/board/comelit/dig297/dig297.c
+++ u-boot.git/board/comelit/dig297/dig297.c
@@ -41,7 +41,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 #include <asm/mach-types.h>
 #include "dig297.h"
 
Index: u-boot.git/board/isee/igep0020/igep0020.c
===================================================================
--- u-boot.git.orig/board/isee/igep0020/igep0020.c
+++ u-boot.git/board/isee/igep0020/igep0020.c
@@ -24,7 +24,7 @@
 #include <netdev.h>
 #include <twl4030.h>
 #include <asm/io.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
Index: u-boot.git/board/logicpd/zoom2/debug_board.c
===================================================================
--- u-boot.git.orig/board/logicpd/zoom2/debug_board.c
+++ u-boot.git/board/logicpd/zoom2/debug_board.c
@@ -22,7 +22,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/io.h>
 #include <asm/arch/mux.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 
 #define DEBUG_BOARD_CONNECTED		1
 #define DEBUG_BOARD_NOT_CONNECTED	0
Index: u-boot.git/board/logicpd/zoom2/led.c
===================================================================
--- u-boot.git.orig/board/logicpd/zoom2/led.c
+++ u-boot.git/board/logicpd/zoom2/led.c
@@ -22,7 +22,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 
 static unsigned int saved_state[2] = {STATUS_LED_OFF, STATUS_LED_OFF};
 
Index: u-boot.git/board/logicpd/zoom2/zoom2.c
===================================================================
--- u-boot.git.orig/board/logicpd/zoom2/zoom2.c
+++ u-boot.git/board/logicpd/zoom2/zoom2.c
@@ -35,7 +35,7 @@
 #endif
 #include <twl4030.h>
 #include <asm/io.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
Index: u-boot.git/board/overo/overo.c
===================================================================
--- u-boot.git.orig/board/overo/overo.c
+++ u-boot.git/board/overo/overo.c
@@ -36,7 +36,7 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 #include <asm/mach-types.h>
 #include "overo.h"
 
Index: u-boot.git/board/ti/beagle/beagle.c
===================================================================
--- u-boot.git.orig/board/ti/beagle/beagle.c
+++ u-boot.git/board/ti/beagle/beagle.c
@@ -38,7 +38,7 @@
 #include <asm/arch/mmc_host_def.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 #include <asm/mach-types.h>
 #ifdef CONFIG_USB_EHCI
 #include <usb.h>
Index: u-boot.git/board/ti/beagle/led.c
===================================================================
--- u-boot.git.orig/board/ti/beagle/led.c
+++ u-boot.git/board/ti/beagle/led.c
@@ -22,7 +22,7 @@
 #include <asm/arch/cpu.h>
 #include <asm/io.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 
 static unsigned int saved_state[2] = {STATUS_LED_OFF, STATUS_LED_OFF};
 
Index: u-boot.git/board/ti/evm/evm.c
===================================================================
--- u-boot.git.orig/board/ti/evm/evm.c
+++ u-boot.git/board/ti/evm/evm.c
@@ -33,7 +33,7 @@
 #include <asm/arch/mem.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/sys_proto.h>
-#include <asm/arch/gpio.h>
+#include <asm/omap_gpio.h>
 #include <i2c.h>
 #include <asm/mach-types.h>
 #include "evm.h"
