From 547966075d32537e01e15f89dbce8e9f0cf9a3ad Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 26 Jul 2011 10:58:41 +0100
Subject: [PATCH] --- yaml --- r: 269391 b: refs/heads/master c:
 db3f72853ee2d89beb1e0bbec274fca0bf44db54 h: refs/heads/master i:   269389:
 d54baf4d581261310fe80d31dd80039ffa8a1d2f   269387:
 175b97153fb5ebaf5303b04bdea0047d404f720e   269383:
 7a69bfc50a43f102495b94d0a943d45a2b3f781d   269375:
 1f9a88c2205abe1fd9379c2011fcedfdd41a20d0 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/usb/host/ohci-pnx4008.c | 2 +-
 trunk/drivers/video/pnx4008/sdum.c    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a014cd7ec398..6135623a2b42 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 667efc5894f50b36af96274bfbc31af8fb67833e
+refs/heads/master: db3f72853ee2d89beb1e0bbec274fca0bf44db54
diff --git a/trunk/drivers/usb/host/ohci-pnx4008.c b/trunk/drivers/usb/host/ohci-pnx4008.c
index 653d6a60edb5..d1b41933199e 100644
--- a/trunk/drivers/usb/host/ohci-pnx4008.c
+++ b/trunk/drivers/usb/host/ohci-pnx4008.c
@@ -26,7 +26,7 @@
 
 #include <mach/platform.h>
 #include <mach/irqs.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 
 #define USB_CTRL	IO_ADDRESS(PNX4008_PWRMAN_BASE + 0x64)
 
diff --git a/trunk/drivers/video/pnx4008/sdum.c b/trunk/drivers/video/pnx4008/sdum.c
index 5ec4f2d439c9..50e00395240f 100644
--- a/trunk/drivers/video/pnx4008/sdum.c
+++ b/trunk/drivers/video/pnx4008/sdum.c
@@ -30,7 +30,7 @@
 #include <linux/clk.h>
 #include <linux/gfp.h>
 #include <asm/uaccess.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 
 #include "sdum.h"
 #include "fbcommon.h"