git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mjg59/platf...
[sfrench/cifs-2.6.git]
/
drivers
/
staging
/
cx25821
/
cx25821-video-upstream-ch2.h
diff --git
a/drivers/staging/cx25821/cx25821-video-upstream-ch2.h
b/drivers/staging/cx25821/cx25821-video-upstream-ch2.h
index 73feea114c1cb5691f763eb9b8aa261e10803726..62340636c91609174cc0144fe157cd5d75bd5d31 100644
(file)
--- a/
drivers/staging/cx25821/cx25821-video-upstream-ch2.h
+++ b/
drivers/staging/cx25821/cx25821-video-upstream-ch2.h
@@
-37,7
+37,7
@@
#define RESET_STATUS -1
#define NUM_NO_OPS 5
-/
/ PAL and NTSC line sizes and number of lines.
+/
* PAL and NTSC line sizes and number of lines. */
#define WIDTH_D1 720
#define NTSC_LINES_PER_FRAME 480
#define PAL_LINES_PER_FRAME 576