summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2010-04-21 14:36:57 (GMT)
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-05-19 15:57:48 (GMT)
commitc683357236969c48f7b945fd718f141bf36e8ba2 (patch)
tree61d2b3f792582861d193520d3526611334c0c625 /drivers
parenteb78deecb496a8b0888d24f1cfa73f6e907b82e2 (diff)
downloadlinux-c683357236969c48f7b945fd718f141bf36e8ba2.tar.xz
Revert "V4L/DVB: Add FE_CAN_PSK_8 to allow apps to identify PSK_8 capable DVB devices"
Patch reverted per Andreas Oberritter <obi@linuxtv.org> request. It is basically not ready yet for upstream merge. This reverts commit 77b2ad374a82e3d740cb1780ff4caedc3e051b37. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/dvb-usb/gp8psk-fe.c2
-rw-r--r--drivers/media/dvb/frontends/cx24116.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/dvb/dvb-usb/gp8psk-fe.c b/drivers/media/dvb/dvb-usb/gp8psk-fe.c
index 3914380..7a7f1b2 100644
--- a/drivers/media/dvb/dvb-usb/gp8psk-fe.c
+++ b/drivers/media/dvb/dvb-usb/gp8psk-fe.c
@@ -349,7 +349,7 @@ static struct dvb_frontend_ops gp8psk_fe_ops = {
* FE_CAN_QAM_16 is for compatibility
* (Myth incorrectly detects Turbo-QPSK as plain QAM-16)
*/
- FE_CAN_QPSK | FE_CAN_QAM_16 | FE_CAN_PSK_8
+ FE_CAN_QPSK | FE_CAN_QAM_16
},
.release = gp8psk_fe_release,
diff --git a/drivers/media/dvb/frontends/cx24116.c b/drivers/media/dvb/frontends/cx24116.c
index 13ae2c5..2410d8b 100644
--- a/drivers/media/dvb/frontends/cx24116.c
+++ b/drivers/media/dvb/frontends/cx24116.c
@@ -1479,7 +1479,7 @@ static struct dvb_frontend_ops cx24116_ops = {
FE_CAN_FEC_4_5 | FE_CAN_FEC_5_6 | FE_CAN_FEC_6_7 |
FE_CAN_FEC_7_8 | FE_CAN_FEC_AUTO |
FE_CAN_2G_MODULATION |
- FE_CAN_QPSK | FE_CAN_RECOVER | FE_CAN_PSK_8
+ FE_CAN_QPSK | FE_CAN_RECOVER
},
.release = cx24116_release,