From 2e650efaab915f51ff594ad07660d075b11b5020 Mon Sep 17 00:00:00 2001
From: Rob Herring <rob.herring@calxeda.com>
Date: Wed, 29 Feb 2012 18:07:40 -0600
Subject: [PATCH] --- yaml --- r: 297648 b: refs/heads/master c:
 5e71412c7a46090499e622a87239562af95b204d h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/media/video/davinci/vpbe_osd.c  | 1 -
 trunk/drivers/media/video/davinci/vpbe_venc.c | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b84e29a425f6..345c10c130b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6076c644126e5424f32aec6c8f2bdc19bbcc8859
+refs/heads/master: 5e71412c7a46090499e622a87239562af95b204d
diff --git a/trunk/drivers/media/video/davinci/vpbe_osd.c b/trunk/drivers/media/video/davinci/vpbe_osd.c
index d6488b79ae3b..bba299dbf396 100644
--- a/trunk/drivers/media/video/davinci/vpbe_osd.c
+++ b/trunk/drivers/media/video/davinci/vpbe_osd.c
@@ -28,7 +28,6 @@
 #include <linux/clk.h>
 #include <linux/slab.h>
 
-#include <mach/io.h>
 #include <mach/cputype.h>
 #include <mach/hardware.h>
 
diff --git a/trunk/drivers/media/video/davinci/vpbe_venc.c b/trunk/drivers/media/video/davinci/vpbe_venc.c
index 00e80f59d5d5..b21ecc8d134d 100644
--- a/trunk/drivers/media/video/davinci/vpbe_venc.c
+++ b/trunk/drivers/media/video/davinci/vpbe_venc.c
@@ -27,7 +27,6 @@
 
 #include <mach/hardware.h>
 #include <mach/mux.h>
-#include <mach/io.h>
 #include <mach/i2c.h>
 
 #include <linux/io.h>