diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 19:26:54 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-23 18:00:22 -0400 |
commit | 2864462eaf027ff10c1df1ce57d3518332e9083c (patch) | |
tree | 8c8821332b24f050601b5e1cc584752aa541034e /drivers/media/video | |
parent | 35ea11ff84719b1bfab2909903a9640a86552fd1 (diff) |
V4L/DVB (8434): Fix x86_64 compilation and move some macros to v4l2-ioctl.h
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/compat_ioctl32.c | 2 | ||||
-rw-r--r-- | drivers/media/video/stradis.c | 1 | ||||
-rw-r--r-- | drivers/media/video/w9968cf.c | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/drivers/media/video/compat_ioctl32.c b/drivers/media/video/compat_ioctl32.c index 54de0cd482e..bd5d9de5a00 100644 --- a/drivers/media/video/compat_ioctl32.c +++ b/drivers/media/video/compat_ioctl32.c | |||
@@ -17,7 +17,7 @@ | |||
17 | #include <linux/videodev2.h> | 17 | #include <linux/videodev2.h> |
18 | #include <linux/module.h> | 18 | #include <linux/module.h> |
19 | #include <linux/smp_lock.h> | 19 | #include <linux/smp_lock.h> |
20 | #include <media/v4l2-common.h> | 20 | #include <media/v4l2-ioctl.h> |
21 | 21 | ||
22 | #ifdef CONFIG_COMPAT | 22 | #ifdef CONFIG_COMPAT |
23 | 23 | ||
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c index c109511f21e..6ace8923b79 100644 --- a/drivers/media/video/stradis.c +++ b/drivers/media/video/stradis.c | |||
@@ -43,6 +43,7 @@ | |||
43 | #include <linux/vmalloc.h> | 43 | #include <linux/vmalloc.h> |
44 | #include <linux/videodev.h> | 44 | #include <linux/videodev.h> |
45 | #include <media/v4l2-common.h> | 45 | #include <media/v4l2-common.h> |
46 | #include <media/v4l2-ioctl.h> | ||
46 | 47 | ||
47 | #include "saa7146.h" | 48 | #include "saa7146.h" |
48 | #include "saa7146reg.h" | 49 | #include "saa7146reg.h" |
diff --git a/drivers/media/video/w9968cf.c b/drivers/media/video/w9968cf.c index 3f5a59dc5f8..56bbeec542c 100644 --- a/drivers/media/video/w9968cf.c +++ b/drivers/media/video/w9968cf.c | |||
@@ -42,6 +42,7 @@ | |||
42 | #include <asm/page.h> | 42 | #include <asm/page.h> |
43 | #include <asm/uaccess.h> | 43 | #include <asm/uaccess.h> |
44 | #include <linux/page-flags.h> | 44 | #include <linux/page-flags.h> |
45 | #include <media/v4l2-ioctl.h> | ||
45 | 46 | ||
46 | #include "w9968cf.h" | 47 | #include "w9968cf.h" |
47 | #include "w9968cf_decoder.h" | 48 | #include "w9968cf_decoder.h" |