diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-30 07:06:39 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-08-30 07:06:39 -0300 |
| commit | 9bcda4998b34e63d38d390763cdbda7706f033d9 (patch) | |
| tree | 963ec6a411f4d3c6393a6477d89613290989c8aa /v4l2-apps/test | |
| parent | d0c6f4ec6b9d0e37d63cfc2e25bd415f305a0be8 (diff) | |
| parent | 67e93560aecd64287dd726434d034631f33fa158 (diff) | |
| download | mediapointer-dvb-s2-9bcda4998b34e63d38d390763cdbda7706f033d9.tar.gz mediapointer-dvb-s2-9bcda4998b34e63d38d390763cdbda7706f033d9.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb
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; |