1 files changed, 0 insertions, 67 deletions
diff --git a/patches/collateral-evolutions/regulator/0001-bt8xx-rename-dst-ops.patch b/patches/collateral-evolutions/regulator/0001-bt8xx-rename-dst-ops.patch
deleted file mode 100644
index 2e8e1b38..00000000
--- a/patches/collateral-evolutions/regulator/0001-bt8xx-rename-dst-ops.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-This will be sent upstream... there is a conflict with these
-names and another symbol from older kernels.
-
---- a/drivers/media/pci/bt8xx/dst.c
-+++ b/drivers/media/pci/bt8xx/dst.c
-@@ -1544,7 +1544,7 @@ static int dst_send_burst(struct dvb_fro
- }
- 
- 
--static int dst_init(struct dvb_frontend *fe)
-+static int bt8xx_dst_init(struct dvb_frontend *fe)
- {
- 	struct dst_state *state = fe->demodulator_priv;
- 
-@@ -1707,7 +1707,7 @@ static int dst_get_frontend(struct dvb_f
- 	return 0;
- }
- 
--static void dst_release(struct dvb_frontend *fe)
-+static void bt8xx_dst_release(struct dvb_frontend *fe)
- {
- 	struct dst_state *state = fe->demodulator_priv;
- 	if (state->dst_ca) {
-@@ -1776,8 +1776,8 @@ static struct dvb_frontend_ops dst_dvbt_
- 			FE_CAN_GUARD_INTERVAL_AUTO
- 	},
- 
--	.release = dst_release,
--	.init = dst_init,
-+	.release = bt8xx_dst_release,
-+	.init = bt8xx_dst_init,
- 	.tune = dst_tune_frontend,
- 	.set_frontend = dst_set_frontend,
- 	.get_frontend = dst_get_frontend,
-@@ -1801,8 +1801,8 @@ static struct dvb_frontend_ops dst_dvbs_
- 		.caps = FE_CAN_FEC_AUTO | FE_CAN_QPSK
- 	},
- 
--	.release = dst_release,
--	.init = dst_init,
-+	.release = bt8xx_dst_release,
-+	.init = bt8xx_dst_init,
- 	.tune = dst_tune_frontend,
- 	.set_frontend = dst_set_frontend,
- 	.get_frontend = dst_get_frontend,
-@@ -1834,8 +1834,8 @@ static struct dvb_frontend_ops dst_dvbc_
- 			FE_CAN_QAM_256
- 	},
- 
--	.release = dst_release,
--	.init = dst_init,
-+	.release = bt8xx_dst_release,
-+	.init = bt8xx_dst_init,
- 	.tune = dst_tune_frontend,
- 	.set_frontend = dst_set_frontend,
- 	.get_frontend = dst_get_frontend,
-@@ -1857,8 +1857,8 @@ static struct dvb_frontend_ops dst_atsc_
- 		.caps = FE_CAN_FEC_AUTO | FE_CAN_QAM_AUTO | FE_CAN_QAM_64 | FE_CAN_QAM_256 | FE_CAN_8VSB
- 	},
- 
--	.release = dst_release,
--	.init = dst_init,
-+	.release = bt8xx_dst_release,
-+	.init = bt8xx_dst_init,
- 	.tune = dst_tune_frontend,
- 	.set_frontend = dst_set_frontend,
- 	.get_frontend = dst_get_frontend,