diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-02 04:51:51 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-04-02 04:51:51 -0300 |
| commit | ccc9a7ea538fa702d897eead24eefc64bd4960d9 (patch) | |
| tree | 6a1b68e9933c0853fc1cb4f1ec61d66589f4a5e1 /linux | |
| parent | 6499c4b8ab1554b94358bc6d69709e1c22d8b606 (diff) | |
| download | mediapointer-dvb-s2-ccc9a7ea538fa702d897eead24eefc64bd4960d9.tar.gz mediapointer-dvb-s2-ccc9a7ea538fa702d897eead24eefc64bd4960d9.tar.bz2 | |
Kernel-sync patch
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Mostly because of documentation renames from mkfrufy.
Also, a small fix at cpia2.
kernel-sync
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/video/Kconfig | 14 | ||||
| -rw-r--r-- | linux/drivers/media/video/cpia2/cpia2.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/linux/drivers/media/video/Kconfig b/linux/drivers/media/video/Kconfig index 911da5210..98f7201cd 100644 --- a/linux/drivers/media/video/Kconfig +++ b/linux/drivers/media/video/Kconfig @@ -439,8 +439,8 @@ config USB_OV511 depends on USB && VIDEO_DEV ---help--- Say Y here if you want to connect this type of camera to your - computer's USB port. See <file:Documentation/usb/ov511.txt> for more - information and for a list of supported cameras. + computer's USB port. See <file:Documentation/video4linux/ov511.txt> + for more information and for a list of supported cameras. To compile this driver as a module, choose M here: the module will be called ov511. @@ -450,8 +450,8 @@ config USB_SE401 depends on USB && VIDEO_DEV ---help--- Say Y here if you want to connect this type of camera to your - computer's USB port. See <file:Documentation/usb/se401.txt> for more - information and for a list of supported cameras. + computer's USB port. See <file:Documentation/video4linux/se401.txt> + for more information and for a list of supported cameras. To compile this driver as a module, choose M here: the module will be called se401. @@ -464,8 +464,8 @@ config USB_STV680 ---help--- Say Y here if you want to connect this type of camera to your computer's USB port. This includes the Pencam line of cameras. - See <file:Documentation/usb/stv680.txt> for more information and for - a list of supported cameras. + See <file:Documentation/video4linux/stv680.txt> for more information + and for a list of supported cameras. To compile this driver as a module, choose M here: the module will be called stv680. @@ -483,7 +483,7 @@ config USB_W9968CF resolutions and framerates, but cannot be included in the official Linux kernel for performance purposes. - See <file:Documentation/usb/w9968cf.txt> for more informations. + See <file:Documentation/video4linux/w9968cf.txt> for more info. To compile this driver as a module, choose M here: the module will be called w9968cf. diff --git a/linux/drivers/media/video/cpia2/cpia2.h b/linux/drivers/media/video/cpia2/cpia2.h index 7480c1827..a53056c82 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 __user *buf, unsigned long count, int noblock); + char *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); |