summaryrefslogtreecommitdiffstats
path: root/include/linux/dvb
diff options
context:
space:
mode:
authorSteven Toth <stoth@linuxtv.org>2008-10-06 21:06:48 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-13 12:27:24 -0200
commit0a6393ae21d58e85882185ce1e6b0fe28ff2dfa6 (patch)
tree658582ca377a3d41dd9717dcac9ae397411567dd /include/linux/dvb
parent8a4949b7e98cbb9e304416ecf6da978e1fb1fb9e (diff)
downloadop-kernel-dev-0a6393ae21d58e85882185ce1e6b0fe28ff2dfa6.zip
op-kernel-dev-0a6393ae21d58e85882185ce1e6b0fe28ff2dfa6.tar.gz
V4L/DVB (9177): S2API: Change _8PSK / _16APSK to PSK_8 and APSK_16
... and cleanup any drivers using them. I've also removed NBC_QPSK and modified the cx24116 driver to check the delivery_type also, removing some excess namespace baggage. Signed-off-by: Steven Toth <stoth@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/linux/dvb')
-rw-r--r--include/linux/dvb/frontend.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index 1cfcd1a..291dd8e 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -164,9 +164,8 @@ typedef enum fe_modulation {
QAM_AUTO,
VSB_8,
VSB_16,
- _8PSK,
- _16APSK,
- NBC_QPSK,
+ PSK_8,
+ APSK_16,
DQPSK,
} fe_modulation_t;
OpenPOWER on IntegriCloud