From 315a2cbd6e78c0801d41923fa3ad5ce9d8babb6a Mon Sep 17 00:00:00 2001
From: Antti Palosaari <crope@iki.fi>
Date: Sun, 12 Aug 2012 22:33:22 -0300
Subject: [PATCH] --- yaml --- r: 330794 b: refs/heads/master c:
 8746adda9eec9da9a2c5c2944740163628bd1d68 h: refs/heads/master v: v3

---
 [refs]                                                | 2 +-
 trunk/Documentation/DocBook/media/dvb/dvbproperty.xml | 1 +
 trunk/include/linux/dvb/frontend.h                    | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4449e46aa885..be5bf4388f9e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 224b6642f5e82a1b21f6b552c799fa02e527d542
+refs/heads/master: 8746adda9eec9da9a2c5c2944740163628bd1d68
diff --git a/trunk/Documentation/DocBook/media/dvb/dvbproperty.xml b/trunk/Documentation/DocBook/media/dvb/dvbproperty.xml
index 5aea35e66af7..eddfe6f9a750 100644
--- a/trunk/Documentation/DocBook/media/dvb/dvbproperty.xml
+++ b/trunk/Documentation/DocBook/media/dvb/dvbproperty.xml
@@ -821,6 +821,7 @@ typedef enum fe_hierarchy {
 	<programlisting>
 enum fe_interleaving {
 	INTERLEAVING_NONE,
+	INTERLEAVING_AUTO,
 	INTERLEAVING_240,
 	INTERLEAVING_720,
 };
diff --git a/trunk/include/linux/dvb/frontend.h b/trunk/include/linux/dvb/frontend.h
index 2dd5823b59b9..c92b4d64e013 100644
--- a/trunk/include/linux/dvb/frontend.h
+++ b/trunk/include/linux/dvb/frontend.h
@@ -222,6 +222,7 @@ typedef enum fe_hierarchy {
 
 enum fe_interleaving {
 	INTERLEAVING_NONE,
+	INTERLEAVING_AUTO,
 	INTERLEAVING_240,
 	INTERLEAVING_720,
 };