summaryrefslogtreecommitdiff
path: root/drivers/media/video/saa7164/saa7164-vbi.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2011-05-24 10:32:20 +0400
committerPaul Mundt <lethal@linux-sh.org>2011-05-24 10:32:20 +0400
commit9fb4c7fbbcb1e947567d13b82e429ae47a46e337 (patch)
tree6c5f11f347d0f58565381f92680a7a9cc63c0bd8 /drivers/media/video/saa7164/saa7164-vbi.c
parentdc3e5b6a6e842116ec2436161adf31877f09b6b9 (diff)
parentd762f4383100c2a87b1a3f2d678cd3b5425655b4 (diff)
downloadlinux-9fb4c7fbbcb1e947567d13b82e429ae47a46e337.tar.xz
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/media/video/saa7164/saa7164-vbi.c')
-rw-r--r--drivers/media/video/saa7164/saa7164-vbi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/saa7164/saa7164-vbi.c b/drivers/media/video/saa7164/saa7164-vbi.c
index 9e5b01c29cf5..bc1fcedba874 100644
--- a/drivers/media/video/saa7164/saa7164-vbi.c
+++ b/drivers/media/video/saa7164/saa7164-vbi.c
@@ -148,7 +148,7 @@ static int saa7164_vbi_buffers_alloc(struct saa7164_port *port)
}
}
- /* Allocate some kenrel kernel buffers for copying
+ /* Allocate some kernel buffers for copying
* to userpsace.
*/
len = params->numberoflines * params->pitch;