aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2012-08-12 21:33:22 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-08-13 15:01:28 -0400
commit8746adda9eec9da9a2c5c2944740163628bd1d68 (patch)
tree807165f1573ba80a921b1e5eee27ee0f034ec2de
parent224b6642f5e82a1b21f6b552c799fa02e527d542 (diff)
[media] DVB API: add INTERLEAVING_AUTO
After thinking twice, I ended up adding own value for AUTO interleaving instead of using NONE. API minor number is not needed to increase as that patch should be the same Kernel as interleaving parameter is initially added. Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/DocBook/media/dvb/dvbproperty.xml1
-rw-r--r--include/linux/dvb/frontend.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/Documentation/DocBook/media/dvb/dvbproperty.xml b/Documentation/DocBook/media/dvb/dvbproperty.xml
index 5aea35e66af7..eddfe6f9a750 100644
--- a/Documentation/DocBook/media/dvb/dvbproperty.xml
+++ b/Documentation/DocBook/media/dvb/dvbproperty.xml
@@ -821,6 +821,7 @@ typedef enum fe_hierarchy {
821 <programlisting> 821 <programlisting>
822enum fe_interleaving { 822enum fe_interleaving {
823 INTERLEAVING_NONE, 823 INTERLEAVING_NONE,
824 INTERLEAVING_AUTO,
824 INTERLEAVING_240, 825 INTERLEAVING_240,
825 INTERLEAVING_720, 826 INTERLEAVING_720,
826}; 827};
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index 2dd5823b59b9..c92b4d64e013 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -222,6 +222,7 @@ typedef enum fe_hierarchy {
222 222
223enum fe_interleaving { 223enum fe_interleaving {
224 INTERLEAVING_NONE, 224 INTERLEAVING_NONE,
225 INTERLEAVING_AUTO,
225 INTERLEAVING_240, 226 INTERLEAVING_240,
226 INTERLEAVING_720, 227 INTERLEAVING_720,
227}; 228};