summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin P. Mattock2010-12-31 00:08:03 +0100
committerJiri Kosina2011-01-03 16:03:38 +0100
commiteb78bd7d8a39415245a8d20ae3b464ddde68b20a (patch)
tree18fea76187bbe53c6002efbe3f3bdb8179dd368a
parentremove doc for obsolete dynamic-printk kernel-parameter (diff)
downloadkernel-qcow2-linux-eb78bd7d8a39415245a8d20ae3b464ddde68b20a.tar.gz
kernel-qcow2-linux-eb78bd7d8a39415245a8d20ae3b464ddde68b20a.tar.xz
kernel-qcow2-linux-eb78bd7d8a39415245a8d20ae3b464ddde68b20a.zip
media: comment typo fix diable -> disable.
The below patch fixes a typo "diable" to "disable". Signed-off-by: Justin P. Mattock <justinmattock@gmail.com> Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
-rw-r--r--drivers/media/video/cx18/cx23418.h2
-rw-r--r--drivers/media/video/tvp7002.c2
-rw-r--r--include/media/davinci/vpss.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/video/cx18/cx23418.h b/drivers/media/video/cx18/cx23418.h
index 2c00980acfcb..7e40035028d2 100644
--- a/drivers/media/video/cx18/cx23418.h
+++ b/drivers/media/video/cx18/cx23418.h
@@ -177,7 +177,7 @@
IN[0] - Task handle.
IN[1] - luma type: 0 = disable, 1 = 1D horizontal only, 2 = 1D vertical only,
3 = 2D H/V separable, 4 = 2D symmetric non-separable
- IN[2] - chroma type: 0 - diable, 1 = 1D horizontal
+ IN[2] - chroma type: 0 - disable, 1 = 1D horizontal
ReturnCode - One of the ERR_CAPTURE_... */
#define CX18_CPU_SET_SPATIAL_FILTER_TYPE (CPU_CMD_MASK_CAPTURE | 0x000C)
diff --git a/drivers/media/video/tvp7002.c b/drivers/media/video/tvp7002.c
index e63b40f5a706..c799e4eb6fcd 100644
--- a/drivers/media/video/tvp7002.c
+++ b/drivers/media/video/tvp7002.c
@@ -789,7 +789,7 @@ static int tvp7002_query_dv_preset(struct v4l2_subdev *sd,
* Get the value of a TVP7002 decoder device register.
* Returns zero when successful, -EINVAL if register read fails or
* access to I2C client fails, -EPERM if the call is not allowed
- * by diabled CAP_SYS_ADMIN.
+ * by disabled CAP_SYS_ADMIN.
*/
static int tvp7002_g_register(struct v4l2_subdev *sd,
struct v4l2_dbg_register *reg)
diff --git a/include/media/davinci/vpss.h b/include/media/davinci/vpss.h
index c59cc029c74a..b586495bcd53 100644
--- a/include/media/davinci/vpss.h
+++ b/include/media/davinci/vpss.h
@@ -44,7 +44,7 @@ struct vpss_pg_frame_size {
short pplen;
};
-/* Used for enable/diable VPSS Clock */
+/* Used for enable/disable VPSS Clock */
enum vpss_clock_sel {
/* DM355/DM365 */
VPSS_CCDC_CLOCK,