summaryrefslogtreecommitdiff
path: root/v4l2-apps/libv4l/libv4l1/log.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2009-06-21 15:09:45 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2009-06-21 15:09:45 -0300
commit0b8face2f09a06c0608472c22fe5a704b6dc4c0e (patch)
tree39d774e364a86e831312c1568cd8438afcd773c8 /v4l2-apps/libv4l/libv4l1/log.c
parent04ef26ec109fff2b6d310da4dabdafc4135ad058 (diff)
parent85a3fd2b44d6162a4288a264537c287adf79b4f9 (diff)
downloadmediapointer-dvb-s2-0b8face2f09a06c0608472c22fe5a704b6dc4c0e.tar.gz
mediapointer-dvb-s2-0b8face2f09a06c0608472c22fe5a704b6dc4c0e.tar.bz2
merge: http://kernellabs.com/hg/~mkrufky/bug-fix
From: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'v4l2-apps/libv4l/libv4l1/log.c')
-rw-r--r--v4l2-apps/libv4l/libv4l1/log.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/v4l2-apps/libv4l/libv4l1/log.c b/v4l2-apps/libv4l/libv4l1/log.c
index 9ff0cea46..fd095817f 100644
--- a/v4l2-apps/libv4l/libv4l1/log.c
+++ b/v4l2-apps/libv4l/libv4l1/log.c
@@ -18,12 +18,7 @@
#include <stdio.h>
#include <stdlib.h>
-#include <linux/ioctl.h>
-/* These headers are not needed by us, but by linux/videodev2.h,
- which is broken on some systems and doesn't include them itself :( */
-#include <sys/time.h>
-#include <asm/types.h>
-/* end broken header workaround includes */
+#include "../libv4lconvert/libv4lsyscall-priv.h"
#include <linux/videodev.h>
#include "libv4l1-priv.h"