7 files changed, 13 insertions, 13 deletions

diff --git a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
index 04989b7a165c..7b0ea3bdfafb 100644
--- a/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
+++ b/drivers/media/dvb/b2c2/flexcop-fe-tuner.c
@@ -252,7 +252,7 @@ static struct stv0299_config samsung_tbmu24112_config = {
         .mclk = 88000000UL,
         .invert = 0,
         .skip_reinit = 0,
-        .lock_output = STV0229_LOCKOUTPUT_LK,
+        .lock_output = STV0299_LOCKOUTPUT_LK,
         .volt13_op0_op1 = STV0299_VOLT13_OP1,
         .min_delay_ms = 100,
         .set_symbol_rate = samsung_tbmu24112_set_symbol_rate,
diff --git a/drivers/media/dvb/dvb-usb/opera1.c b/drivers/media/dvb/dvb-usb/opera1.c
index 0eef5fe094e1..7e32d11f32b0 100644
--- a/drivers/media/dvb/dvb-usb/opera1.c
+++ b/drivers/media/dvb/dvb-usb/opera1.c
@@ -246,7 +246,7 @@ static struct stv0299_config opera1_stv0299_config = {
         .mclk = 88000000UL,
         .invert = 1,
         .skip_reinit = 0,
-        .lock_output = STV0229_LOCKOUTPUT_0,
+        .lock_output = STV0299_LOCKOUTPUT_0,
         .volt13_op0_op1 = STV0299_VOLT13_OP0,
         .inittab = opera1_inittab,
         .set_symbol_rate = opera1_stv0299_set_symbol_rate,
diff --git a/drivers/media/dvb/frontends/bsru6.h b/drivers/media/dvb/frontends/bsru6.h
index e231cd84b3a1..45a6dfd8ebb5 100644
--- a/drivers/media/dvb/frontends/bsru6.h
+++ b/drivers/media/dvb/frontends/bsru6.h
@@ -133,7 +133,7 @@ static struct stv0299_config alps_bsru6_config = {
         .mclk = 88000000UL,
         .invert = 1,
         .skip_reinit = 0,
-        .lock_output = STV0229_LOCKOUTPUT_1,
+        .lock_output = STV0299_LOCKOUTPUT_1,
         .volt13_op0_op1 = STV0299_VOLT13_OP1,
         .min_delay_ms = 100,
         .set_symbol_rate = alps_bsru6_set_symbol_rate,
diff --git a/drivers/media/dvb/frontends/stv0299.h b/drivers/media/dvb/frontends/stv0299.h
index abd9cf8153cf..3282f43022f5 100644
--- a/drivers/media/dvb/frontends/stv0299.h
+++ b/drivers/media/dvb/frontends/stv0299.h
@@ -48,10 +48,10 @@
 #include <linux/dvb/frontend.h>
 #include "dvb_frontend.h"
 
-#define STV0229_LOCKOUTPUT_0  0
-#define STV0229_LOCKOUTPUT_1  1
-#define STV0229_LOCKOUTPUT_CF 2
-#define STV0229_LOCKOUTPUT_LK 3
+#define STV0299_LOCKOUTPUT_0  0
+#define STV0299_LOCKOUTPUT_1  1
+#define STV0299_LOCKOUTPUT_CF 2
+#define STV0299_LOCKOUTPUT_LK 3
 
 #define STV0299_VOLT13_OP0 0
 #define STV0299_VOLT13_OP1 1
diff --git a/drivers/media/dvb/ttpci/budget-av.c b/drivers/media/dvb/ttpci/budget-av.c
index ed7fb1df554d..b30a5288e484 100644
--- a/drivers/media/dvb/ttpci/budget-av.c
+++ b/drivers/media/dvb/ttpci/budget-av.c
@@ -577,7 +577,7 @@ static struct stv0299_config typhoon_config = {
         .mclk = 88000000UL,
         .invert = 0,
         .skip_reinit = 0,
-        .lock_output = STV0229_LOCKOUTPUT_1,
+        .lock_output = STV0299_LOCKOUTPUT_1,
         .volt13_op0_op1 = STV0299_VOLT13_OP0,
         .min_delay_ms = 100,
         .set_symbol_rate = philips_su1278_ty_ci_set_symbol_rate,
@@ -590,7 +590,7 @@ static struct stv0299_config cinergy_1200s_config = {
         .mclk = 88000000UL,
         .invert = 0,
         .skip_reinit = 0,
-        .lock_output = STV0229_LOCKOUTPUT_0,
+        .lock_output = STV0299_LOCKOUTPUT_0,
         .volt13_op0_op1 = STV0299_VOLT13_OP0,
         .min_delay_ms = 100,
         .set_symbol_rate = philips_su1278_ty_ci_set_symbol_rate,
@@ -602,7 +602,7 @@ static struct stv0299_config cinergy_1200s_1894_0010_config = {
         .mclk = 88000000UL,
         .invert = 1,
         .skip_reinit = 0,
-        .lock_output = STV0229_LOCKOUTPUT_1,
+        .lock_output = STV0299_LOCKOUTPUT_1,
         .volt13_op0_op1 = STV0299_VOLT13_OP0,
         .min_delay_ms = 100,
         .set_symbol_rate = philips_su1278_ty_ci_set_symbol_rate,
@@ -869,7 +869,7 @@ static struct stv0299_config philips_sd1878_config = {
         .mclk = 88000000UL,
         .invert = 0,
         .skip_reinit = 0,
-        .lock_output = STV0229_LOCKOUTPUT_1,
+        .lock_output = STV0299_LOCKOUTPUT_1,
         .volt13_op0_op1 = STV0299_VOLT13_OP0,
         .min_delay_ms = 100,
         .set_symbol_rate = philips_sd1878_ci_set_symbol_rate,
diff --git a/drivers/media/dvb/ttpci/budget-ci.c b/drivers/media/dvb/ttpci/budget-ci.c
index 0323515bfd2a..6530323d5406 100644
--- a/drivers/media/dvb/ttpci/budget-ci.c
+++ b/drivers/media/dvb/ttpci/budget-ci.c
@@ -728,7 +728,7 @@ static struct stv0299_config philips_su1278_tt_config = {
         .mclk = 64000000UL,
         .invert = 0,
         .skip_reinit = 1,
-        .lock_output = STV0229_LOCKOUTPUT_1,
+        .lock_output = STV0299_LOCKOUTPUT_1,
         .volt13_op0_op1 = STV0299_VOLT13_OP1,
         .min_delay_ms = 50,
         .set_symbol_rate = philips_su1278_tt_set_symbol_rate,
diff --git a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
index 46dc4a3fcb6c..732ce4de512e 100644
--- a/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
+++ b/drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
@@ -1314,7 +1314,7 @@ static struct stv0299_config alps_stv0299_config = {
         .mclk = 88000000UL,
         .invert = 1,
         .skip_reinit = 0,
-        .lock_output = STV0229_LOCKOUTPUT_1,
+        .lock_output = STV0299_LOCKOUTPUT_1,
         .volt13_op0_op1 = STV0299_VOLT13_OP1,
         .min_delay_ms = 100,
         .set_symbol_rate = alps_stv0299_set_symbol_rate,