diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 16:03:58 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 16:03:58 -0500 |
commit | f17578decc40df8fceff82b106582e30bdfb3189 (patch) | |
tree | 911a435a2094ac03ae649f020237674224e4124a /drivers/media/video/saa7134/saa7134-empress.c | |
parent | 682e852e2638ed0aff84aa51181c9e5d2f939562 (diff) | |
parent | cec418346e5a411e907293aba7cc21ac53c95834 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb
Diffstat (limited to 'drivers/media/video/saa7134/saa7134-empress.c')
-rw-r--r-- | drivers/media/video/saa7134/saa7134-empress.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c index 575f3e835f91..bd4c389d4c37 100644 --- a/drivers/media/video/saa7134/saa7134-empress.c +++ b/drivers/media/video/saa7134/saa7134-empress.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include "saa7134.h" | 29 | #include "saa7134.h" |
30 | 30 | ||
31 | #include <media/saa6752hs.h> | 31 | #include <media/saa6752hs.h> |
32 | #include <media/v4l2-common.h> | ||
32 | 33 | ||
33 | /* ------------------------------------------------------------------ */ | 34 | /* ------------------------------------------------------------------ */ |
34 | 35 | ||
@@ -163,7 +164,7 @@ static int ts_do_ioctl(struct inode *inode, struct file *file, | |||
163 | struct saa7134_dev *dev = file->private_data; | 164 | struct saa7134_dev *dev = file->private_data; |
164 | 165 | ||
165 | if (debug > 1) | 166 | if (debug > 1) |
166 | saa7134_print_ioctl(dev->name,cmd); | 167 | v4l_print_ioctl(dev->name,cmd); |
167 | switch (cmd) { | 168 | switch (cmd) { |
168 | case VIDIOC_QUERYCAP: | 169 | case VIDIOC_QUERYCAP: |
169 | { | 170 | { |