From 40f521bbb92bde04acfc08a6e547dcbb287b4c8e Mon Sep 17 00:00:00 2001
From: Manu Abraham <abraham.manu@gmail.com>
Date: Sat, 17 Dec 2011 20:36:55 -0300
Subject: [PATCH] --- yaml --- r: 285395 b: refs/heads/master c:
 bf3b84006e22ae241ec3d53dbe6c6d1f6ceddb56 h: refs/heads/master i:   285393:
 2e616c122216c0c912b72841759da0bb03f2fc97   285391:
 20fc256cdf079ceda5b75c8d66bce655e0e88174 v: v3

---
 [refs]                             | 2 +-
 trunk/include/linux/dvb/frontend.h | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b67ffdb2f8a7..de17ceb60628 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 875e2e3edf48a206c64195666cf408dd3d119137
+refs/heads/master: bf3b84006e22ae241ec3d53dbe6c6d1f6ceddb56
diff --git a/trunk/include/linux/dvb/frontend.h b/trunk/include/linux/dvb/frontend.h
index cb114f52ccf7..b2a939f8f1e2 100644
--- a/trunk/include/linux/dvb/frontend.h
+++ b/trunk/include/linux/dvb/frontend.h
@@ -337,7 +337,7 @@ typedef enum fe_rolloff {
 
 typedef enum fe_delivery_system {
 	SYS_UNDEFINED,
-	SYS_DVBC_ANNEX_AC,
+	SYS_DVBC_ANNEX_A,
 	SYS_DVBC_ANNEX_B,
 	SYS_DVBT,
 	SYS_DSS,
@@ -354,8 +354,13 @@ typedef enum fe_delivery_system {
 	SYS_DAB,
 	SYS_DVBT2,
 	SYS_TURBO,
+	SYS_DVBC_ANNEX_C,
 } fe_delivery_system_t;
 
+
+#define SYS_DVBC_ANNEX_AC	SYS_DVBC_ANNEX_A
+
+
 struct dtv_cmds_h {
 	char	*name;		/* A display name for debugging purposes */