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>

1 files changed, 2 insertions, 3 deletions

diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index 1cfcd1a86e8a..291dd8e5e58d 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;