Revert "V4L/DVB: Add FE_CAN_PSK_8 to allow apps to identify PSK_8 cap…

…able 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>
git-mirror · May 19, 2010 · c683357 · c683357
1 parent eb78dee
commit c683357
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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,

diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
@@ -62,7 +62,6 @@ typedef enum fe_caps {
 	FE_CAN_8VSB			= 0x200000,
 	FE_CAN_16VSB			= 0x400000,
 	FE_HAS_EXTENDED_CAPS		= 0x800000,   /* We need more bitspace for newer APIs, indicate this. */
-       FE_CAN_PSK_8                    = 0x8000000,  /* frontend supports "8psk modulation" */
 	FE_CAN_2G_MODULATION		= 0x10000000, /* frontend supports "2nd generation modulation" (DVB-S2) */
 	FE_NEEDS_BENDING		= 0x20000000, /* not supported anymore, don't use (frontend requires frequency bending) */
 	FE_CAN_RECOVER			= 0x40000000, /* frontend can recover from a cable unplug automatically */