diff options
author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-19 06:29:17 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-19 06:29:17 -0400 |
commit | b2409b65d9401f7e3c572fc59db6a920fc7a163e (patch) | |
tree | 46163e5433bd06ebb9066a40cca223927993fbdb /drivers/media | |
parent | ff30d37083096acb56fb6edc0209d7ba36731a55 (diff) |
[media] remove include/linux/dvb/dmx.h
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>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/dvb-core/dmxdev.h | 1 | ||||
-rw-r--r-- | drivers/media/firewire/firedtv.h | 1 | ||||
-rw-r--r-- | drivers/media/pci/ttpci/av7110.h | 1 | ||||
-rw-r--r-- | drivers/media/usb/tlg2300/pd-dvb.c | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/drivers/media/dvb-core/dmxdev.h b/drivers/media/dvb-core/dmxdev.h index 02ebe28f830d..48c6cf92ab99 100644 --- a/drivers/media/dvb-core/dmxdev.h +++ b/drivers/media/dvb-core/dmxdev.h | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <linux/types.h> | 26 | #include <linux/types.h> |
27 | #include <linux/spinlock.h> | 27 | #include <linux/spinlock.h> |
28 | #include <linux/kernel.h> | 28 | #include <linux/kernel.h> |
29 | #include <linux/time.h> | ||
29 | #include <linux/timer.h> | 30 | #include <linux/timer.h> |
30 | #include <linux/wait.h> | 31 | #include <linux/wait.h> |
31 | #include <linux/fs.h> | 32 | #include <linux/fs.h> |
diff --git a/drivers/media/firewire/firedtv.h b/drivers/media/firewire/firedtv.h index 4fdcd8cb7530..c2ba085e0d20 100644 --- a/drivers/media/firewire/firedtv.h +++ b/drivers/media/firewire/firedtv.h | |||
@@ -13,6 +13,7 @@ | |||
13 | #ifndef _FIREDTV_H | 13 | #ifndef _FIREDTV_H |
14 | #define _FIREDTV_H | 14 | #define _FIREDTV_H |
15 | 15 | ||
16 | #include <linux/time.h> | ||
16 | #include <linux/dvb/dmx.h> | 17 | #include <linux/dvb/dmx.h> |
17 | #include <linux/dvb/frontend.h> | 18 | #include <linux/dvb/frontend.h> |
18 | #include <linux/list.h> | 19 | #include <linux/list.h> |
diff --git a/drivers/media/pci/ttpci/av7110.h b/drivers/media/pci/ttpci/av7110.h index 88b3b2d6cc0e..a378662b1dcf 100644 --- a/drivers/media/pci/ttpci/av7110.h +++ b/drivers/media/pci/ttpci/av7110.h | |||
@@ -6,6 +6,7 @@ | |||
6 | #include <linux/netdevice.h> | 6 | #include <linux/netdevice.h> |
7 | #include <linux/i2c.h> | 7 | #include <linux/i2c.h> |
8 | #include <linux/input.h> | 8 | #include <linux/input.h> |
9 | #include <linux/time.h> | ||
9 | 10 | ||
10 | #include <linux/dvb/video.h> | 11 | #include <linux/dvb/video.h> |
11 | #include <linux/dvb/audio.h> | 12 | #include <linux/dvb/audio.h> |
diff --git a/drivers/media/usb/tlg2300/pd-dvb.c b/drivers/media/usb/tlg2300/pd-dvb.c index 30fcb117e898..ca4994a5190c 100644 --- a/drivers/media/usb/tlg2300/pd-dvb.c +++ b/drivers/media/usb/tlg2300/pd-dvb.c | |||
@@ -1,6 +1,7 @@ | |||
1 | #include "pd-common.h" | 1 | #include "pd-common.h" |
2 | #include <linux/kernel.h> | 2 | #include <linux/kernel.h> |
3 | #include <linux/usb.h> | 3 | #include <linux/usb.h> |
4 | #include <linux/time.h> | ||
4 | #include <linux/dvb/dmx.h> | 5 | #include <linux/dvb/dmx.h> |
5 | #include <linux/delay.h> | 6 | #include <linux/delay.h> |
6 | #include <linux/gfp.h> | 7 | #include <linux/gfp.h> |