From 2e13aef14f1d7b4a4934484b8af681cf0c049119 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Fri, 19 Oct 2012 07:29:17 -0300
Subject: [PATCH] --- yaml --- r: 343770 b: refs/heads/master c:
 b2409b65d9401f7e3c572fc59db6a920fc7a163e h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/drivers/media/dvb-core/dmxdev.h    |  1 +
 trunk/drivers/media/firewire/firedtv.h   |  1 +
 trunk/drivers/media/pci/ttpci/av7110.h   |  1 +
 trunk/drivers/media/usb/tlg2300/pd-dvb.c |  1 +
 trunk/include/linux/dvb/dmx.h            | 29 ------------------------
 6 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 trunk/include/linux/dvb/dmx.h

diff --git a/[refs] b/[refs]
index 6b22e5a46c8c..cd5e4f9ab128 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ff30d37083096acb56fb6edc0209d7ba36731a55
+refs/heads/master: b2409b65d9401f7e3c572fc59db6a920fc7a163e
diff --git a/trunk/drivers/media/dvb-core/dmxdev.h b/trunk/drivers/media/dvb-core/dmxdev.h
index 02ebe28f830d..48c6cf92ab99 100644
--- a/trunk/drivers/media/dvb-core/dmxdev.h
+++ b/trunk/drivers/media/dvb-core/dmxdev.h
@@ -26,6 +26,7 @@
 #include <linux/types.h>
 #include <linux/spinlock.h>
 #include <linux/kernel.h>
+#include <linux/time.h>
 #include <linux/timer.h>
 #include <linux/wait.h>
 #include <linux/fs.h>
diff --git a/trunk/drivers/media/firewire/firedtv.h b/trunk/drivers/media/firewire/firedtv.h
index 4fdcd8cb7530..c2ba085e0d20 100644
--- a/trunk/drivers/media/firewire/firedtv.h
+++ b/trunk/drivers/media/firewire/firedtv.h
@@ -13,6 +13,7 @@
 #ifndef _FIREDTV_H
 #define _FIREDTV_H
 
+#include <linux/time.h>
 #include <linux/dvb/dmx.h>
 #include <linux/dvb/frontend.h>
 #include <linux/list.h>
diff --git a/trunk/drivers/media/pci/ttpci/av7110.h b/trunk/drivers/media/pci/ttpci/av7110.h
index 88b3b2d6cc0e..a378662b1dcf 100644
--- a/trunk/drivers/media/pci/ttpci/av7110.h
+++ b/trunk/drivers/media/pci/ttpci/av7110.h
@@ -6,6 +6,7 @@
 #include <linux/netdevice.h>
 #include <linux/i2c.h>
 #include <linux/input.h>
+#include <linux/time.h>
 
 #include <linux/dvb/video.h>
 #include <linux/dvb/audio.h>
diff --git a/trunk/drivers/media/usb/tlg2300/pd-dvb.c b/trunk/drivers/media/usb/tlg2300/pd-dvb.c
index 30fcb117e898..ca4994a5190c 100644
--- a/trunk/drivers/media/usb/tlg2300/pd-dvb.c
+++ b/trunk/drivers/media/usb/tlg2300/pd-dvb.c
@@ -1,6 +1,7 @@
 #include "pd-common.h"
 #include <linux/kernel.h>
 #include <linux/usb.h>
+#include <linux/time.h>
 #include <linux/dvb/dmx.h>
 #include <linux/delay.h>
 #include <linux/gfp.h>
diff --git a/trunk/include/linux/dvb/dmx.h b/trunk/include/linux/dvb/dmx.h
deleted file mode 100644
index 0be6d8f2b52b..000000000000
--- a/trunk/include/linux/dvb/dmx.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * dmx.h
- *
- * Copyright (C) 2000 Marcus Metzler <marcus@convergence.de>
- *                  & Ralph  Metzler <ralph@convergence.de>
- *                    for convergence integrated media GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- */
-#ifndef _DVBDMX_H_
-#define _DVBDMX_H_
-
-#include <linux/time.h>
-#include <uapi/linux/dvb/dmx.h>
-
-#endif /*_DVBDMX_H_*/