---

yaml --- r: 297647 b: refs/heads/master c: 6076c64 h: refs/heads/master i: 297645: 396b60e 297643: abc4852 297639: 0c48fed 297631: cab4d4a v: v3
git-mirror · Mar 7, 2012 · d273f39 · d273f39
1 parent 9986b38
commit d273f39
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -27,7 +27,6 @@
 #include <linux/bitops.h>
 #include <linux/mutex.h>
 
-#include <mach/io.h>
 #include <plat/vrfb.h>
 #include <plat/sdrc.h>
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,6 @@ @@
      * published by the Free Software Foundation.
      */
-    #include <mach/io.h>
     /* SDRC register offsets - read/write with sdrc_{read,write}_reg() */
@@ Expand Down @@