diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-31 00:51:07 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2006-03-31 00:51:07 +0200 |
| commit | 6ab97d48e334a99bca82e891d2136a0d40bba07b (patch) | |
| tree | cd0c0eeab73923a2c899183309eabc9dd9758b49 /linux/drivers/media/video | |
| parent | f11510a3383a92e9158e7174c335e20707e5bc51 (diff) | |
| parent | 3d2479ff04112f41bd9a231f1aed9e96fdd8d07d (diff) | |
| download | mediapointer-dvb-s2-6ab97d48e334a99bca82e891d2136a0d40bba07b.tar.gz mediapointer-dvb-s2-6ab97d48e334a99bca82e891d2136a0d40bba07b.tar.bz2 | |
merge: from master
From: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video')
| -rw-r--r-- | linux/drivers/media/video/cpia2/cpia2.h | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa711x.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/linux/drivers/media/video/cpia2/cpia2.h b/linux/drivers/media/video/cpia2/cpia2.h index a53056c82..7480c1827 100644 --- a/linux/drivers/media/video/cpia2/cpia2.h +++ b/linux/drivers/media/video/cpia2/cpia2.h @@ -462,7 +462,7 @@ int cpia2_init_camera(struct camera_data *cam); int cpia2_allocate_buffers(struct camera_data *cam); void cpia2_free_buffers(struct camera_data *cam); long cpia2_read(struct camera_data *cam, - char *buf, unsigned long count, int noblock); + char __user *buf, unsigned long count, int noblock); unsigned int cpia2_poll(struct camera_data *cam, struct file *filp, poll_table *wait); int cpia2_remap_buffer(struct camera_data *cam, struct vm_area_struct *vma); diff --git a/linux/drivers/media/video/saa711x.c b/linux/drivers/media/video/saa711x.c index f51cd9442..59425506e 100644 --- a/linux/drivers/media/video/saa711x.c +++ b/linux/drivers/media/video/saa711x.c @@ -46,7 +46,6 @@ MODULE_AUTHOR("Dave Perks, Jose Ignacio Gijon, Joerg Heckenbach, Mark McClelland MODULE_LICENSE("GPL"); #include <linux/i2c.h> -#include <linux/i2c-dev.h> #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0) #include "i2c-compat.h" #endif |