diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-30 07:43:57 -0300 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-30 07:43:57 -0300 |
commit | 56e4c75fce1cca2ee4553fd47b31dc8b6d43d688 (patch) | |
tree | cf92072da97e8aea3315303ac188d4f8432d42a8 /v4l2-apps/test | |
parent | 937ba8f2a0dc3b8cdb98de9a48c256ad24427ac9 (diff) | |
parent | 9bcda4998b34e63d38d390763cdbda7706f033d9 (diff) | |
download | mediapointer-dvb-s2-56e4c75fce1cca2ee4553fd47b31dc8b6d43d688.tar.gz mediapointer-dvb-s2-56e4c75fce1cca2ee4553fd47b31dc8b6d43d688.tar.bz2 |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-dev
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l2-apps/test')
-rw-r--r-- | v4l2-apps/test/Makefile | 2 | ||||
-rw-r--r-- | v4l2-apps/test/ioctl-test.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/v4l2-apps/test/Makefile b/v4l2-apps/test/Makefile index ae8868c21..faafed14d 100644 --- a/v4l2-apps/test/Makefile +++ b/v4l2-apps/test/Makefile @@ -1,6 +1,6 @@ # Makefile for linuxtv.org v4l2-apps/test -CPPFLAGS += -I../../linux/include +CPPFLAGS += -I../include binaries = ioctl-test \ sliced-vbi-test \ diff --git a/v4l2-apps/test/ioctl-test.c b/v4l2-apps/test/ioctl-test.c index f483338fb..99ad717e5 100644 --- a/v4l2-apps/test/ioctl-test.c +++ b/v4l2-apps/test/ioctl-test.c @@ -42,7 +42,7 @@ typedef __u8 u8; typedef __u32 u32; #include <linux/version.h> -#include "../linux/include/media/v4l2-common.h" +#include <media/v4l2-common.h> #include <linux/video_decoder.h> #else typedef u_int32_t u32; |