From f3fa2dfd1ec989019dc3ab51ec3dd77a3a013636 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hans.verkuil@cisco.com>
Date: Thu, 15 Dec 2011 10:33:26 -0300
Subject: [PATCH] --- yaml --- r: 294905 b: refs/heads/master c:
 85eeece773a6f0d2ba00958782995cbe68218256 h: refs/heads/master i:   294903:
 66be439b4cc0b47aad68c45eb57f8eabf25064e7 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/media/dvb/ddbridge/ddbridge.h  | 2 --
 trunk/drivers/media/video/cx18/cx18-driver.h | 2 --
 3 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 5eda086371ec..25b817217f21 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: debf80014fc1e8d02b3fd57e5fae0d315ac2cb04
+refs/heads/master: 85eeece773a6f0d2ba00958782995cbe68218256
diff --git a/trunk/drivers/media/dvb/ddbridge/ddbridge.h b/trunk/drivers/media/dvb/ddbridge/ddbridge.h
index 6d14893218f4..8b1b41d2a52d 100644
--- a/trunk/drivers/media/dvb/ddbridge/ddbridge.h
+++ b/trunk/drivers/media/dvb/ddbridge/ddbridge.h
@@ -32,8 +32,6 @@
 #include <asm/dma.h>
 #include <linux/dvb/frontend.h>
 #include <linux/dvb/ca.h>
-#include <linux/dvb/video.h>
-#include <linux/dvb/audio.h>
 #include <linux/socket.h>
 
 #include "dmxdev.h"
diff --git a/trunk/drivers/media/video/cx18/cx18-driver.h b/trunk/drivers/media/video/cx18/cx18-driver.h
index b9a94fc5146d..7a37e0ee136f 100644
--- a/trunk/drivers/media/video/cx18/cx18-driver.h
+++ b/trunk/drivers/media/video/cx18/cx18-driver.h
@@ -44,8 +44,6 @@
 #include <linux/slab.h>
 #include <asm/byteorder.h>
 
-#include <linux/dvb/video.h>
-#include <linux/dvb/audio.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include <media/v4l2-device.h>