From 7ed417003e12bc65bf3497553e0e2176a5503dbd Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Thu, 1 Jul 2010 01:37:34 -0300 Subject: [PATCH] --- yaml --- r: 202023 b: refs/heads/master c: f6a20eb1a2d35660240cd1eb8dc2bd6504a0c6c5 h: refs/heads/master i: 202021: 7511936a99e974ef08e4cd6fe991fe419dd565e3 202019: e7478ed9d547ca2b4dba4d5dbb9cc44bf7de4320 202015: e96450aa22253f6353a2c5bf502c3945f99311a0 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/dvb-usb/gp8psk-fe.c | 2 +- trunk/include/linux/dvb/frontend.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 56867f45b6ad..d51e4f1ee175 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0b21d55f8904ff3d52262e91867f9eb2c0b472f3 +refs/heads/master: f6a20eb1a2d35660240cd1eb8dc2bd6504a0c6c5 diff --git a/trunk/drivers/media/dvb/dvb-usb/gp8psk-fe.c b/trunk/drivers/media/dvb/dvb-usb/gp8psk-fe.c index 7a7f1b2b681c..dbdb5347b2a8 100644 --- a/trunk/drivers/media/dvb/dvb-usb/gp8psk-fe.c +++ b/trunk/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_QPSK | FE_CAN_QAM_16 | FE_CAN_TURBO_FEC }, .release = gp8psk_fe_release, diff --git a/trunk/include/linux/dvb/frontend.h b/trunk/include/linux/dvb/frontend.h index b6cb5425cde3..493a2bf85f62 100644 --- a/trunk/include/linux/dvb/frontend.h +++ b/trunk/include/linux/dvb/frontend.h @@ -62,6 +62,7 @@ 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_TURBO_FEC = 0x8000000, /* frontend supports "turbo fec 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 */