diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-13 11:51:53 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-05-13 11:51:53 -0300 |
| commit | 1976b04c7de32d12ec4c81e42bf21860dadd0dd4 (patch) | |
| tree | 223730b0db7360d12c7edbafebc77c6783e3f72a | |
| parent | 68162fef229a29590b88772eb24894a3e5e424d3 (diff) | |
| download | mediapointer-dvb-s2-1976b04c7de32d12ec4c81e42bf21860dadd0dd4.tar.gz mediapointer-dvb-s2-1976b04c7de32d12ec4c81e42bf21860dadd0dd4.tar.bz2 | |
backport some language fixes at philips.txt
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
| -rw-r--r-- | linux/drivers/media/video/pwc/philips.txt | 6 | ||||
| -rw-r--r-- | linux/sound/oss/btaudio.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/linux/drivers/media/video/pwc/philips.txt b/linux/drivers/media/video/pwc/philips.txt index f5e848410..f9f358428 100644 --- a/linux/drivers/media/video/pwc/philips.txt +++ b/linux/drivers/media/video/pwc/philips.txt @@ -54,9 +54,9 @@ fps Specifies the desired framerate. Is an integer in the range of 4-30. fbufs - This paramter specifies the number of internal buffers to use for storing + This parameter specifies the number of internal buffers to use for storing frames from the cam. This will help if the process that reads images from - the cam is a bit slow or momentarely busy. However, on slow machines it + the cam is a bit slow or momentarily busy. However, on slow machines it only introduces lag, so choose carefully. The default is 3, which is reasonable. You can set it between 2 and 5. @@ -209,7 +209,7 @@ trace 128 0x80 PWCX debugging Off - For example, to trace the open() & read() fuctions, sum 8 + 4 = 12, + For example, to trace the open() & read() functions, sum 8 + 4 = 12, so you would supply trace=12 during insmod or modprobe. If you want to turn the initialization and probing tracing off, set trace=0. The default value for trace is 35 (0x23). diff --git a/linux/sound/oss/btaudio.c b/linux/sound/oss/btaudio.c index 859392e4b..92438ac2f 100644 --- a/linux/sound/oss/btaudio.c +++ b/linux/sound/oss/btaudio.c @@ -353,7 +353,7 @@ static int btaudio_mixer_ioctl(struct inode *inode, struct file *file, if (cmd == SOUND_OLD_MIXER_INFO) { _old_mixer_info info; memset(&info,0,sizeof(info)); - strlcpy(info.id,"bt878",sizeof(info.id)); + strlcpy(info.id, "bt878", sizeof(info.id)); strlcpy(info.name,"Brooktree Bt878 audio",sizeof(info.name)); if (copy_to_user(argp, &info, sizeof(info))) return -EFAULT; |