git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'x86-fixes-for-linus', 'sched-fixes-for-linus', 'timers-fixes-for...
[pandora-kernel.git]
/
drivers
/
media
/
video
/
davinci
/
vpfe_capture.c
diff --git
a/drivers/media/video/davinci/vpfe_capture.c
b/drivers/media/video/davinci/vpfe_capture.c
index
71e961e
..
5b38fc9
100644
(file)
--- a/
drivers/media/video/davinci/vpfe_capture.c
+++ b/
drivers/media/video/davinci/vpfe_capture.c
@@
-1691,7
+1691,7
@@
static int vpfe_s_crop(struct file *file, void *priv,
goto unlock_out;
}
- /* adjust the width to 16 pixel boundry */
+ /* adjust the width to 16 pixel bound
a
ry */
crop->c.width = ((crop->c.width + 15) & ~0xf);
/* make sure parameters are valid */