diff options
author | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 12:25:21 -0500 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@brturbo.com.br> | 2006-01-09 12:25:21 -0500 |
commit | d21838dd7d098e102ced2fafed62dcb133c4d71c (patch) | |
tree | ed8a319559745e9286a1ee1cf0067e08b202b066 /drivers/media/video/saa7134/saa7134.h | |
parent | b060c25f70adb20532dacefa72029d1d2db1a7f1 (diff) |
V4L/DVB (3123b): syncs V4L subsystem tree with kernel
- This patch makes kernel in sync with v4l subsystem tree.
- some lines reordered to be sync.
- some reduntant codes removed.
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Diffstat (limited to 'drivers/media/video/saa7134/saa7134.h')
-rw-r--r-- | drivers/media/video/saa7134/saa7134.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h index 185115226b4b..2f28e83102fd 100644 --- a/drivers/media/video/saa7134/saa7134.h +++ b/drivers/media/video/saa7134/saa7134.h | |||
@@ -37,6 +37,9 @@ | |||
37 | #include <media/ir-common.h> | 37 | #include <media/ir-common.h> |
38 | #include <media/ir-kbd-i2c.h> | 38 | #include <media/ir-kbd-i2c.h> |
39 | #include <media/video-buf.h> | 39 | #include <media/video-buf.h> |
40 | #include <sound/driver.h> | ||
41 | #include <sound/core.h> | ||
42 | #include <sound/pcm.h> | ||
40 | #include <media/video-buf-dvb.h> | 43 | #include <media/video-buf-dvb.h> |
41 | 44 | ||
42 | #ifndef TRUE | 45 | #ifndef TRUE |
@@ -47,10 +50,6 @@ | |||
47 | #endif | 50 | #endif |
48 | #define UNSET (-1U) | 51 | #define UNSET (-1U) |
49 | 52 | ||
50 | #include <sound/driver.h> | ||
51 | #include <sound/core.h> | ||
52 | #include <sound/pcm.h> | ||
53 | |||
54 | /* ----------------------------------------------------------- */ | 53 | /* ----------------------------------------------------------- */ |
55 | /* enums */ | 54 | /* enums */ |
56 | 55 | ||