diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-14 10:20:36 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-04-14 10:20:36 -0300 |
| commit | d5193c5902aab5c738cd11481b408771c9050d8b (patch) | |
| tree | 082888cbe80c3775508ed3d5e96a0fb15999f952 /linux | |
| parent | 28aee8b0e7428e7263d4e53a32677676413fc622 (diff) | |
| download | mediapointer-dvb-s2-d5193c5902aab5c738cd11481b408771c9050d8b.tar.gz mediapointer-dvb-s2-d5193c5902aab5c738cd11481b408771c9050d8b.tar.bz2 | |
backport a few language cleanups
From: Mauro Carvalho Chehab <mchehab@redhat.com>
kernel-sync:
Priority: normal
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux')
| -rw-r--r-- | linux/drivers/media/common/tuners/Kconfig | 2 | ||||
| -rw-r--r-- | linux/drivers/media/dvb/frontends/Kconfig | 2 | ||||
| -rw-r--r-- | linux/drivers/media/video/omap24xxcam.c | 8 | ||||
| -rw-r--r-- | linux/include/media/v4l2-subdev.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/linux/drivers/media/common/tuners/Kconfig b/linux/drivers/media/common/tuners/Kconfig index 52c3f65b1..607d319ce 100644 --- a/linux/drivers/media/common/tuners/Kconfig +++ b/linux/drivers/media/common/tuners/Kconfig @@ -148,7 +148,7 @@ config MEDIA_TUNER_XC5000 default m if MEDIA_TUNER_CUSTOMISE help A driver for the silicon tuner XC5000 from Xceive. - This device is only used inside a SiP called togther with a + This device is only used inside a SiP called together with a demodulator for now. config MEDIA_TUNER_MXL5005S diff --git a/linux/drivers/media/dvb/frontends/Kconfig b/linux/drivers/media/dvb/frontends/Kconfig index 578b834bf..23e4cffeb 100644 --- a/linux/drivers/media/dvb/frontends/Kconfig +++ b/linux/drivers/media/dvb/frontends/Kconfig @@ -479,7 +479,7 @@ config DVB_TUNER_DIB0070 default m if DVB_FE_CUSTOMISE help A driver for the silicon baseband tuner DiB0070 from DiBcom. - This device is only used inside a SiP called togther with a + This device is only used inside a SiP called together with a demodulator for now. comment "SEC control devices for DVB-S" diff --git a/linux/drivers/media/video/omap24xxcam.c b/linux/drivers/media/video/omap24xxcam.c index d828597ba..5fc4ac0d8 100644 --- a/linux/drivers/media/video/omap24xxcam.c +++ b/linux/drivers/media/video/omap24xxcam.c @@ -80,17 +80,17 @@ static int omap24xxcam_clock_get(struct omap24xxcam_device *cam) { int rval = 0; - cam->fck = clk_get(cam->dev, "cam_fck"); + cam->fck = clk_get(cam->dev, "fck"); if (IS_ERR(cam->fck)) { - dev_err(cam->dev, "can't get cam_fck"); + dev_err(cam->dev, "can't get camera fck"); rval = PTR_ERR(cam->fck); omap24xxcam_clock_put(cam); return rval; } - cam->ick = clk_get(cam->dev, "cam_ick"); + cam->ick = clk_get(cam->dev, "ick"); if (IS_ERR(cam->ick)) { - dev_err(cam->dev, "can't get cam_ick"); + dev_err(cam->dev, "can't get camera ick"); rval = PTR_ERR(cam->ick); omap24xxcam_clock_put(cam); } diff --git a/linux/include/media/v4l2-subdev.h b/linux/include/media/v4l2-subdev.h index a43506680..17856081c 100644 --- a/linux/include/media/v4l2-subdev.h +++ b/linux/include/media/v4l2-subdev.h @@ -189,7 +189,7 @@ struct v4l2_subdev_audio_ops { s_std_output: set v4l2_std_id for video OUTPUT devices. This is ignored by video input devices. - s_crystal_freq: sets the frequency of the crystal used to generate the + s_crystal_freq: sets the frequency of the crystal used to generate the clocks in Hz. An extra flags field allows device specific configuration regarding clock frequency dividers, etc. If not used, then set flags to 0. If the frequency is not supported, then -EINVAL is returned. |