- kernel-technisat-combo-hd-ci.patch applied upstream

diff --git a/kernel-technisat-combo-hd-ci.patch b/kernel-technisat-combo-hd-ci.patch
deleted file mode 100644 (file)
index 3a893a3..0000000
--- a/kernel-technisat-combo-hd-ci.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://www.linuxtv.org/wiki/index.php/TechniSat_CableStar_Combo_HD_CI#Patch
---- linux-3.9/drivers/media/dvb-core/dvb-usb-ids.h~    2013-04-29 02:36:01.000000000 +0200
-+++ linux-3.9/drivers/media/dvb-core/dvb-usb-ids.h     2013-06-06 00:32:30.235962480 +0200
-@@ -366,6 +366,7 @@
- #define USB_PID_TERRATEC_DVBS2CI_V2                   0x10ac
- #define USB_PID_TECHNISAT_USB2_HDCI_V1                        0x0001
- #define USB_PID_TECHNISAT_USB2_HDCI_V2                        0x0002
-+#define USB_PID_TECHNISAT_USB2_HDCI_V3                        0x0003
- #define USB_PID_TECHNISAT_AIRSTAR_TELESTICK_2         0x0004
- #define USB_PID_TECHNISAT_USB2_DVB_S2                 0x0500
- #endif
---- linux-3.9/drivers/media/usb/dvb-usb-v2/az6007.c~   2013-04-29 02:36:01.000000000 +0200
-+++ linux-3.9/drivers/media/usb/dvb-usb-v2/az6007.c    2013-06-06 00:35:18.305958097 +0200
-@@ -875,6 +875,8 @@
-               &az6007_props, "Terratec H7", RC_MAP_NEC_TERRATEC_CINERGY_XS)},
-       {DVB_USB_DEVICE(USB_VID_TERRATEC, USB_PID_TERRATEC_H7_2,
-               &az6007_props, "Terratec H7", RC_MAP_NEC_TERRATEC_CINERGY_XS)},
-+      {DVB_USB_DEVICE(USB_VID_TECHNISAT, USB_PID_TECHNISAT_USB2_HDCI_V3,
-+              &az6007_props, "Technisat Combo HD CI", RC_MAP_NEC_TERRATEC_CINERGY_XS)},
-       {0},
- };
- 

diff --git a/kernel.spec b/kernel.spec
index 0624b453f9f945d62c964da1b37f85f4ed53625a..e5fb6ee0cc8316dc6cd41e86cf907159f12a5942 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -185,9 +185,6 @@ Patch59:    kernel-rndis_host-wm5.patch
 # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
 Patch85:       kernel-hostap.patch
 
-# http://www.linuxtv.org/wiki/index.php/TechniSat_CableStar_Combo_HD_CI#Patch
-Patch90:       kernel-technisat-combo-hd-ci.patch
-
 # http://vserver.13thfloor.at/Experimental/patch-3.13.6-vs2.3.6.11.diff
 # note there are additional patches from above url:
 # - *fix* are real fixes (we want these)
@@ -700,9 +697,6 @@ cd linux-%{basever}
 # hostap enhancements from/for aircrack-ng
 %patch85 -p1
 
-# TechniSat_CableStar_Combo_HD_CI
-%patch90 -p1
-
 # vserver
 %if %{with vserver}
 %patch100 -p1