git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
media
/
video
/
cx88
/
cx88-reg.h
diff --git
a/drivers/media/video/cx88/cx88-reg.h
b/drivers/media/video/cx88/cx88-reg.h
index
a80b751
..
4ecce88
100644
(file)
--- a/
drivers/media/video/cx88/cx88-reg.h
+++ b/
drivers/media/video/cx88/cx88-reg.h
@@
-599,20
+599,10
@@
#define EN_I2SIN_STR2DAC 0x00004000
#define EN_I2SIN_ENABLE 0x00008000
#define EN_I2SIN_STR2DAC 0x00004000
#define EN_I2SIN_ENABLE 0x00008000
-#if 0
-/* old */
#define EN_DMTRX_SUMDIFF 0x00000800
#define EN_DMTRX_SUMR 0x00000880
#define EN_DMTRX_LR 0x00000900
#define EN_DMTRX_MONO 0x00000980
#define EN_DMTRX_SUMDIFF 0x00000800
#define EN_DMTRX_SUMR 0x00000880
#define EN_DMTRX_LR 0x00000900
#define EN_DMTRX_MONO 0x00000980
-#else
-/* dscaler cvs */
-#define EN_DMTRX_SUMDIFF (0 << 7)
-#define EN_DMTRX_SUMR (1 << 7)
-#define EN_DMTRX_LR (2 << 7)
-#define EN_DMTRX_MONO (3 << 7)
-#define EN_DMTRX_BYPASS (1 << 11)
-#endif
// Video
#define VID_CAPTURE_CONTROL 0x310180
// Video
#define VID_CAPTURE_CONTROL 0x310180