Merge branches 'x86/pat2' and 'x86/fpu'; commit 'v2.6.28' into x86/core

[linux-2.6-omap-h63xx.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 258792c1784e180c07771ea279e198622bbe015e..cf89d96d7295221c77189d8e24799f7555a4d232 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-reg.h
+++ b/drivers/media/video/saa7134/saa7134-reg.h
@@ -353,7 +353,6 @@
 
 /* I2S output */
 #define SAA7134_I2S_AUDIO_OUTPUT                0x1c0
-#define SAA7134_I2S_AUDIO_CONTROL               0x591
 
 /* test modes */
 #define SAA7134_SPECIAL_MODE                    0x1d0
@@ -369,6 +368,7 @@
 #define SAA7135_DSP_RWCLEAR                    0x586
 #define SAA7135_DSP_RWCLEAR_RERR                   1
 
+#define SAA7133_I2S_AUDIO_CONTROL               0x591
 /* ------------------------------------------------------------------ */
 /*
  * Local variables: