diff options
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/bt8xx/bttv-cards.c | 4 | ||||
-rw-r--r-- | drivers/media/video/meye.c | 2 | ||||
-rw-r--r-- | drivers/media/video/meye.h | 2 | ||||
-rw-r--r-- | drivers/media/video/usbvideo/vicam.c | 2 | ||||
-rw-r--r-- | drivers/media/video/v4l2-common.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index 3162223a2ff5..3abd9fa54d2c 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c | |||
@@ -1259,7 +1259,7 @@ struct tvcard bttv_tvcards[] = { | |||
1259 | .has_radio = 1, | 1259 | .has_radio = 1, |
1260 | }, | 1260 | }, |
1261 | [BTTV_BOARD_LIFETEC_9415] = { | 1261 | [BTTV_BOARD_LIFETEC_9415] = { |
1262 | /* Tim Röstermundt <rosterm@uni-muenster.de> | 1262 | /* Tim Röstermundt <rosterm@uni-muenster.de> |
1263 | in de.comp.os.unix.linux.hardware: | 1263 | in de.comp.os.unix.linux.hardware: |
1264 | options bttv card=0 pll=1 radio=1 gpiomask=0x18e0 | 1264 | options bttv card=0 pll=1 radio=1 gpiomask=0x18e0 |
1265 | gpiomux =0x44c71f,0x44d71f,0,0x44d71f,0x44dfff | 1265 | gpiomux =0x44c71f,0x44d71f,0,0x44d71f,0x44dfff |
@@ -2824,7 +2824,7 @@ struct tvcard bttv_tvcards[] = { | |||
2824 | }, | 2824 | }, |
2825 | /* ---- card 0x8b ---------------------------------- */ | 2825 | /* ---- card 0x8b ---------------------------------- */ |
2826 | [BTTV_BOARD_PV_M4900] = { | 2826 | [BTTV_BOARD_PV_M4900] = { |
2827 | /* Sérgio Fortier <sergiofortier@yahoo.com.br> */ | 2827 | /* Sérgio Fortier <sergiofortier@yahoo.com.br> */ |
2828 | .name = "Prolink PixelView PlayTV MPEG2 PV-M4900", | 2828 | .name = "Prolink PixelView PlayTV MPEG2 PV-M4900", |
2829 | .video_inputs = 3, | 2829 | .video_inputs = 3, |
2830 | .audio_inputs = 1, | 2830 | .audio_inputs = 1, |
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index 7533fc203319..69283926a8dc 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net> | 4 | * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net> |
5 | * | 5 | * |
6 | * Copyright (C) 2001-2002 Alcôve <www.alcove.com> | 6 | * Copyright (C) 2001-2002 Alcôve <www.alcove.com> |
7 | * | 7 | * |
8 | * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com> | 8 | * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com> |
9 | * | 9 | * |
diff --git a/drivers/media/video/meye.h b/drivers/media/video/meye.h index 323d0074120d..d535748df445 100644 --- a/drivers/media/video/meye.h +++ b/drivers/media/video/meye.h | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net> | 4 | * Copyright (C) 2001-2004 Stelian Pop <stelian@popies.net> |
5 | * | 5 | * |
6 | * Copyright (C) 2001-2002 Alcôve <www.alcove.com> | 6 | * Copyright (C) 2001-2002 Alcôve <www.alcove.com> |
7 | * | 7 | * |
8 | * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com> | 8 | * Copyright (C) 2000 Andrew Tridgell <tridge@valinux.com> |
9 | * | 9 | * |
diff --git a/drivers/media/video/usbvideo/vicam.c b/drivers/media/video/usbvideo/vicam.c index ff555129c82f..db3c9e3deb26 100644 --- a/drivers/media/video/usbvideo/vicam.c +++ b/drivers/media/video/usbvideo/vicam.c | |||
@@ -955,7 +955,7 @@ read_frame(struct vicam_camera *cam, int framenum) | |||
955 | request[7] = realShutter >> 8; | 955 | request[7] = realShutter >> 8; |
956 | } | 956 | } |
957 | 957 | ||
958 | // Per John Markus Bjørndalen, byte at index 8 causes problems if it isn't 0 | 958 | // Per John Markus Bjørndalen, byte at index 8 causes problems if it isn't 0 |
959 | request[8] = 0; | 959 | request[8] = 0; |
960 | // bytes 9-15 do not seem to affect exposure or image quality | 960 | // bytes 9-15 do not seem to affect exposure or image quality |
961 | 961 | ||
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index c3440b280d20..321249240d05 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c | |||
@@ -37,7 +37,7 @@ | |||
37 | * Video4linux 1/2 integration by Justin Schoeman | 37 | * Video4linux 1/2 integration by Justin Schoeman |
38 | * <justin@suntiger.ee.up.ac.za> | 38 | * <justin@suntiger.ee.up.ac.za> |
39 | * 2.4 PROCFS support ported from 2.4 kernels by | 39 | * 2.4 PROCFS support ported from 2.4 kernels by |
40 | * Iñaki García Etxebarria <garetxe@euskalnet.net> | 40 | * Iñaki GarcÃa Etxebarria <garetxe@euskalnet.net> |
41 | * Makefile fix by "W. Michael Petullo" <mike@flyn.org> | 41 | * Makefile fix by "W. Michael Petullo" <mike@flyn.org> |
42 | * 2.4 devfs support ported from 2.4 kernels by | 42 | * 2.4 devfs support ported from 2.4 kernels by |
43 | * Dan Merillat <dan@merillat.org> | 43 | * Dan Merillat <dan@merillat.org> |