diff --git a/packages/linux/patches/3.13.0-rc6/todo/linux-999.02-A-split-for-ds3000-ts2020-code-forgot-to-change-the-.patch b/packages/linux/patches/3.13.0-rc6/todo/linux-999.02-A-split-for-ds3000-ts2020-code-forgot-to-change-the-.patch
deleted file mode 100644
index 3e88b490ed..0000000000
--- a/packages/linux/patches/3.13.0-rc6/todo/linux-999.02-A-split-for-ds3000-ts2020-code-forgot-to-change-the-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From edab54fcfb1eb4b56868d2e364cf49dc3c6bad25 Mon Sep 17 00:00:00 2001
-From: Stefan Saraev <stefan@saraev.ca>
-Date: Wed, 18 Sep 2013 14:52:05 +0300
-Subject: [PATCH] A split for ds3000/ts2020 code forgot to change the TEVII_S471 code.
- Change the TEVII_S471 according the changes to TEVII_S470.
-
-BP: https://linuxtv.org/patch/19731/
----
- drivers/media/pci/cx23885/cx23885-dvb.c |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
-
-diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c
-index 5db14f8..4cbf20a 100644
---- a/drivers/media/pci/cx23885/cx23885-dvb.c
-+++ b/drivers/media/pci/cx23885/cx23885-dvb.c
-@@ -1339,6 +1339,11 @@ static int dvb_register(struct cx23885_tsport *port)
- 		fe0->dvb.frontend = dvb_attach(ds3000_attach,
- 					&tevii_ds3000_config,
- 					&i2c_bus->i2c_adap);
-+		if (fe0->dvb.frontend != NULL) {
-+			dvb_attach(ts2020_attach, fe0->dvb.frontend,
-+				&tevii_ts2020_config, &i2c_bus->i2c_adap);
-+			fe0->dvb.frontend->ops.set_voltage = f300_set_voltage;
-+		}
- 		break;
- 	case CX23885_BOARD_BST_PS8512:
- 	case CX23885_BOARD_DVBSKY_S950:
--- 
-1.7.2.5
-
diff --git a/projects/ARCTIC_MC/linux/linux.x86_64.conf b/projects/ARCTIC_MC/linux/linux.x86_64.conf
index 7815a4c94c..4384325649 100644
--- a/projects/ARCTIC_MC/linux/linux.x86_64.conf
+++ b/projects/ARCTIC_MC/linux/linux.x86_64.conf
@@ -2155,7 +2155,10 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
 #
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_AU0828_V4L2=y
-# CONFIG_VIDEO_CX231XX is not set
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
 CONFIG_VIDEO_TM6000=m
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
diff --git a/projects/ATV/linux/linux.i386.conf b/projects/ATV/linux/linux.i386.conf
index aa5674466e..4a3f77a733 100644
--- a/projects/ATV/linux/linux.i386.conf
+++ b/projects/ATV/linux/linux.i386.conf
@@ -1865,7 +1865,10 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
 #
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_AU0828_V4L2=y
-# CONFIG_VIDEO_CX231XX is not set
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
 CONFIG_VIDEO_TM6000=m
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
diff --git a/projects/Generic/linux/linux.i386.conf b/projects/Generic/linux/linux.i386.conf
index 7bf693ee96..fe63ca8103 100644
--- a/projects/Generic/linux/linux.i386.conf
+++ b/projects/Generic/linux/linux.i386.conf
@@ -2177,7 +2177,10 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
 #
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_AU0828_V4L2=y
-# CONFIG_VIDEO_CX231XX is not set
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
 CONFIG_VIDEO_TM6000=m
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
diff --git a/projects/Generic/linux/linux.x86_64.conf b/projects/Generic/linux/linux.x86_64.conf
index fdbca63b7e..d43872779e 100644
--- a/projects/Generic/linux/linux.x86_64.conf
+++ b/projects/Generic/linux/linux.x86_64.conf
@@ -2156,7 +2156,10 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
 #
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_AU0828_V4L2=y
-# CONFIG_VIDEO_CX231XX is not set
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
 CONFIG_VIDEO_TM6000=m
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
diff --git a/projects/RPi/linux/linux.arm.conf b/projects/RPi/linux/linux.arm.conf
index 71a2258451..5767e16317 100644
--- a/projects/RPi/linux/linux.arm.conf
+++ b/projects/RPi/linux/linux.arm.conf
@@ -1614,7 +1614,9 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
 #
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_AU0828_V4L2=y
-# CONFIG_VIDEO_CX231XX is not set
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_DVB=m
 CONFIG_VIDEO_TM6000=m
 CONFIG_VIDEO_TM6000_DVB=m
 
diff --git a/projects/Virtual/linux/linux.i386.conf b/projects/Virtual/linux/linux.i386.conf
index a5a85de79b..0760fd5bac 100644
--- a/projects/Virtual/linux/linux.i386.conf
+++ b/projects/Virtual/linux/linux.i386.conf
@@ -2176,7 +2176,10 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
 #
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_AU0828_V4L2=y
-# CONFIG_VIDEO_CX231XX is not set
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
 CONFIG_VIDEO_TM6000=m
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m
diff --git a/projects/Virtual/linux/linux.x86_64.conf b/projects/Virtual/linux/linux.x86_64.conf
index 37564f22ad..84b3a4f75e 100644
--- a/projects/Virtual/linux/linux.x86_64.conf
+++ b/projects/Virtual/linux/linux.x86_64.conf
@@ -2155,7 +2155,10 @@ CONFIG_VIDEO_PVRUSB2_DVB=y
 #
 CONFIG_VIDEO_AU0828=m
 CONFIG_VIDEO_AU0828_V4L2=y
-# CONFIG_VIDEO_CX231XX is not set
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
 CONFIG_VIDEO_TM6000=m
 CONFIG_VIDEO_TM6000_ALSA=m
 CONFIG_VIDEO_TM6000_DVB=m