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 git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
[pandora-kernel.git]
/
drivers
/
media
/
video
/
saa7134
/
saa7134-reg.h
diff --git
a/drivers/media/video/saa7134/saa7134-reg.h
b/drivers/media/video/saa7134/saa7134-reg.h
index
86f5eef
..
cf89d96
100644
(file)
--- a/
drivers/media/video/saa7134/saa7134-reg.h
+++ b/
drivers/media/video/saa7134/saa7134-reg.h
@@
-368,6
+368,7
@@
#define SAA7135_DSP_RWCLEAR 0x586
#define SAA7135_DSP_RWCLEAR_RERR 1
#define SAA7135_DSP_RWCLEAR 0x586
#define SAA7135_DSP_RWCLEAR_RERR 1
+#define SAA7133_I2S_AUDIO_CONTROL 0x591
/* ------------------------------------------------------------------ */
/*
* Local variables:
/* ------------------------------------------------------------------ */
/*
* Local variables: