Merge branch 'syscore' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspen...

[pandora-kernel.git] / drivers / media / dvb / frontends / stv090x_reg.h

diff --git a/drivers/media/dvb/frontends/stv090x_reg.h b/drivers/media/dvb/frontends/stv090x_reg.h
index 2502855..93741ee 100644 (file)
--- a/drivers/media/dvb/frontends/stv090x_reg.h
+++ b/drivers/media/dvb/frontends/stv090x_reg.h
@@ -1327,10 +1327,10 @@
 #define STV090x_WIDTH_Px_NOSPLHT_UNNORMED_FIELD        8
 
 #define STV090x_Px_NOSPLHy(__x, __y)           (0xf48f - (__x - 1) * 0x200 - __y * 0x1)
-#define STv090x_P1_NOSPLH0                     STV090x_Px_NOSPLHy(1, 0)
-#define STv090x_P1_NOSPLH1                     STV090x_Px_NOSPLHy(1, 1)
-#define STv090x_P2_NOSPLH0                     STV090x_Px_NOSPLHy(2, 0)
-#define STv090x_P2_NOSPLH1                     STV090x_Px_NOSPLHy(2, 1)
+#define STV090x_P1_NOSPLH0                     STV090x_Px_NOSPLHy(1, 0)
+#define STV090x_P1_NOSPLH1                     STV090x_Px_NOSPLHy(1, 1)
+#define STV090x_P2_NOSPLH0                     STV090x_Px_NOSPLHy(2, 0)
+#define STV090x_P2_NOSPLH1                     STV090x_Px_NOSPLHy(2, 1)
 #define STV090x_OFFST_Px_NOSPLH_UNNORMED_FIELD 0
 #define STV090x_WIDTH_Px_NOSPLH_UNNORMED_FIELD 8
 
@@ -1406,7 +1406,7 @@
 
 #define STV090x_Px_BCLC2S28(__x)               (0xf49d - (__x - 1) * 0x200)
 #define STV090x_P1_BCLC2S28                    STV090x_Px_BCLC2S28(1)
-#define STV090x_P2_BCLC2S28                    STV090x_Px_BCLC2S28(1)
+#define STV090x_P2_BCLC2S28                    STV090x_Px_BCLC2S28(2)
 #define STV090x_OFFST_Px_CAR2S2_8_BETA_M_FIELD 4
 #define STV090x_WIDTH_Px_CAR2S2_8_BETA_M_FIELD 2
 #define STV090x_OFFST_Px_CAR2S2_8_BETA_E_FIELD 0
@@ -1414,7 +1414,7 @@
 
 #define STV090x_Px_BCLC2S216A(__x)             (0xf49e - (__x - 1) * 0x200)
 #define STV090x_P1_BCLC2S216A                  STV090x_Px_BCLC2S216A(1)
-#define STV090x_P2_BCLC2S216A                  STV090x_Px_BCLC2S216A(1)
+#define STV090x_P2_BCLC2S216A                  STV090x_Px_BCLC2S216A(2)
 #define STV090x_OFFST_Px_CAR2S2_16A_BETA_M_FIELD       4
 #define STV090x_WIDTH_Px_CAR2S2_16A_BETA_M_FIELD       2
 #define STV090x_OFFST_Px_CAR2S2_16A_BETA_E_FIELD       0
@@ -1422,7 +1422,7 @@
 
 #define STV090x_Px_BCLC2S232A(__x)             (0xf49f - (__x - 1) * 0x200)
 #define STV090x_P1_BCLC2S232A                  STV090x_Px_BCLC2S232A(1)
-#define STV090x_P2_BCLC2S232A                  STV090x_Px_BCLC2S232A(1)
+#define STV090x_P2_BCLC2S232A                  STV090x_Px_BCLC2S232A(2)
 #define STV090x_OFFST_Px_CAR2S2_32A_BETA_M_FIELD       4
 #define STV090x_WIDTH_Px_CAR2S2_32A_BETA_M_FIELD       2
 #define STV090x_OFFST_Px_CAR2S2_32A_BETA_E_FIELD       0
@@ -1602,7 +1602,7 @@
 
 #define STV090x_Px_CCIACC(__x)                 (0xf4c4 - (__x - 1) * 0x200)
 #define STV090x_P1_CCIACC                      STV090x_Px_CCIACC(1)
-#define STV090x_P2_CCIACC                      STV090x_Px_CCIACC(1)
+#define STV090x_P2_CCIACC                      STV090x_Px_CCIACC(2)
 #define STV090x_OFFST_Px_CCI_VALUE_FIELD       0
 #define STV090x_WIDTH_Px_CCI_VALUE_FIELD       8