summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ff30d37)
raw | patch | inline | side by side (parent: ff30d37)
author | Mauro Carvalho Chehab <mchehab@redhat.com> | |
Fri, 19 Oct 2012 10:29:17 +0000 (07:29 -0300) | ||
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | |
Fri, 19 Oct 2012 10:29:17 +0000 (07:29 -0300) |
The only reason for this header is to make sure that include
linux/time.h were added before uapi/*/dmx.h. Just push down the
time.h header on the few places where this is used, and drop
this new header.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
linux/time.h were added before uapi/*/dmx.h. Just push down the
time.h header on the few places where this is used, and drop
this new header.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
index 02ebe28f830d811b9ea7079ad450cc626a6b3863..48c6cf92ab994c896d9e0f2d155e532c0aa5c500 100644 (file)
#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>
index 4fdcd8cb753010416bbbf1d7c271208541b4b157..c2ba085e0d20d10717adb63c362028b320d25007 100644 (file)
#ifndef _FIREDTV_H
#define _FIREDTV_H
+#include <linux/time.h>
#include <linux/dvb/dmx.h>
#include <linux/dvb/frontend.h>
#include <linux/list.h>
index 88b3b2d6cc0e9dbcbf04d50987e40b0576b9c6ae..a378662b1dcfce4450f3d0834f72901ac0a63c4c 100644 (file)
#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>
index 30fcb117e89899a25208428061900d22eefb829c..ca4994a5190ce4fbb5f11a918869ca78963c7021 100644 (file)
#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/include/linux/dvb/dmx.h b/include/linux/dvb/dmx.h
--- a/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_*/