From d273f392cbc0521f912c0b3ec8eab9e67382c102 Mon Sep 17 00:00:00 2001
From: Tony Lindgren <tony@atomide.com>
Date: Thu, 1 Mar 2012 08:35:01 -0600
Subject: [PATCH] --- yaml --- r: 297647 b: refs/heads/master c:
 6076c644126e5424f32aec6c8f2bdc19bbcc8859 h: refs/heads/master i:   297645:
 396b60e0265cf4cff68d541538f56789ae801e0a   297643:
 abc48522f887e30a6fccb73cb2f11bc5a88fc3ee   297639:
 0c48fed1aba3225cba7e91c57c6a3693cfacfc34   297631:
 cab4d4a11b02d1394ae66a8e9db275dc82daf9f4 v: v3

---
 [refs]                                               | 2 +-
 trunk/arch/arm/mach-omap1/include/mach/entry-macro.S | 1 -
 trunk/arch/arm/mach-omap1/sleep.S                    | 2 --
 trunk/arch/arm/mach-omap1/sram.S                     | 1 -
 trunk/arch/arm/plat-omap/include/plat/sdrc.h         | 1 -
 trunk/drivers/video/omap2/vrfb.c                     | 1 -
 6 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index ad0982f2ccdc..b84e29a425f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 68a7f1f79f004e7a2a53352c82319d567ebb1da1
+refs/heads/master: 6076c644126e5424f32aec6c8f2bdc19bbcc8859
diff --git a/trunk/arch/arm/mach-omap1/include/mach/entry-macro.S b/trunk/arch/arm/mach-omap1/include/mach/entry-macro.S
index fa0f32a686aa..88f08cab1717 100644
--- a/trunk/arch/arm/mach-omap1/include/mach/entry-macro.S
+++ b/trunk/arch/arm/mach-omap1/include/mach/entry-macro.S
@@ -11,7 +11,6 @@
  */
 
 #include <mach/hardware.h>
-#include <mach/io.h>
 #include <mach/irqs.h>
 
 #include "../../iomap.h"
diff --git a/trunk/arch/arm/mach-omap1/sleep.S b/trunk/arch/arm/mach-omap1/sleep.S
index 0779db150da7..0e628743bd03 100644
--- a/trunk/arch/arm/mach-omap1/sleep.S
+++ b/trunk/arch/arm/mach-omap1/sleep.S
@@ -36,8 +36,6 @@
 
 #include <asm/assembler.h>
 
-#include <mach/io.h>
-
 #include "iomap.h"
 #include "pm.h"
 
diff --git a/trunk/arch/arm/mach-omap1/sram.S b/trunk/arch/arm/mach-omap1/sram.S
index 2ce0b9ab20e5..00e9d9e9adf1 100644
--- a/trunk/arch/arm/mach-omap1/sram.S
+++ b/trunk/arch/arm/mach-omap1/sram.S
@@ -12,7 +12,6 @@
 
 #include <asm/assembler.h>
 
-#include <mach/io.h>
 #include <mach/hardware.h>
 
 #include "iomap.h"
diff --git a/trunk/arch/arm/plat-omap/include/plat/sdrc.h b/trunk/arch/arm/plat-omap/include/plat/sdrc.h
index 925b12b500dc..9bb978ecd884 100644
--- a/trunk/arch/arm/plat-omap/include/plat/sdrc.h
+++ b/trunk/arch/arm/plat-omap/include/plat/sdrc.h
@@ -16,7 +16,6 @@
  * published by the Free Software Foundation.
  */
 
-#include <mach/io.h>
 
 /* SDRC register offsets - read/write with sdrc_{read,write}_reg() */
 
diff --git a/trunk/drivers/video/omap2/vrfb.c b/trunk/drivers/video/omap2/vrfb.c
index fd2271600370..4e5b960c32c8 100644
--- a/trunk/drivers/video/omap2/vrfb.c
+++ b/trunk/drivers/video/omap2/vrfb.c
@@ -27,7 +27,6 @@
 #include <linux/bitops.h>
 #include <linux/mutex.h>
 
-#include <mach/io.h>
 #include <plat/vrfb.h>
 #include <plat/sdrc.h>