From f5c49119179ef221faddd64eebe1b20b6c2a46f2 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 26 Feb 2009 21:22:18 -0300
Subject: [PATCH] --- yaml --- r: 137991 b: refs/heads/master c:
 770060385a1694a8d909e7872c4ce0703da2b069 h: refs/heads/master i:   137989:
 72f06c102265184871886d1097a0868a949d82d2   137987:
 10a746618deb1d7eb71128f1875a5daec45c9619   137983:
 8e4fde78bda23e0aa1ac8a646942edda28e35479 v: v3

---
 [refs]                                                | 2 +-
 trunk/drivers/media/video/tvp5150.c                   | 1 -
 trunk/drivers/media/video/usbvision/usbvision-core.c  | 1 -
 trunk/drivers/media/video/usbvision/usbvision-video.c | 1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4d47b79c2d52..252fc32d2353 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e686e73ca7e6b157c8a4877c5dc9655b20c4967a
+refs/heads/master: 770060385a1694a8d909e7872c4ce0703da2b069
diff --git a/trunk/drivers/media/video/tvp5150.c b/trunk/drivers/media/video/tvp5150.c
index 6b600bed445f..9ee55f26c4f9 100644
--- a/trunk/drivers/media/video/tvp5150.c
+++ b/trunk/drivers/media/video/tvp5150.c
@@ -8,7 +8,6 @@
 #include <linux/i2c.h>
 #include <linux/videodev2.h>
 #include <linux/delay.h>
-#include <linux/video_decoder.h>
 #include <media/v4l2-device.h>
 #include <media/tvp5150.h>
 #include <media/v4l2-i2c-drv-legacy.h>
diff --git a/trunk/drivers/media/video/usbvision/usbvision-core.c b/trunk/drivers/media/video/usbvision/usbvision-core.c
index eadebb91b092..71cb4aabdf7d 100644
--- a/trunk/drivers/media/video/usbvision/usbvision-core.c
+++ b/trunk/drivers/media/video/usbvision/usbvision-core.c
@@ -36,7 +36,6 @@
 #include <linux/spinlock.h>
 #include <asm/io.h>
 #include <linux/videodev2.h>
-#include <linux/video_decoder.h>
 #include <linux/i2c.h>
 
 #include <media/saa7115.h>
diff --git a/trunk/drivers/media/video/usbvision/usbvision-video.c b/trunk/drivers/media/video/usbvision/usbvision-video.c
index cfa184d63c65..33d79a5dad0f 100644
--- a/trunk/drivers/media/video/usbvision/usbvision-video.c
+++ b/trunk/drivers/media/video/usbvision/usbvision-video.c
@@ -59,7 +59,6 @@
 #include <linux/spinlock.h>
 #include <asm/io.h>
 #include <linux/videodev2.h>
-#include <linux/video_decoder.h>
 #include <linux/i2c.h>
 
 #include <media/saa7115.h>