diff --git a/[refs] b/[refs] index f288d5b9ebd2..d8741c2cdf2c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f098cb1c8b226a99595512e1029c8d1680f69cd +refs/heads/master: 83dc314bea4d701e3e5fa048314dfb02f7ef769c diff --git a/trunk/Documentation/DocBook/media/dvb/dvbproperty.xml b/trunk/Documentation/DocBook/media/dvb/dvbproperty.xml index 207e1a5bf8f0..75bea04e02bb 100644 --- a/trunk/Documentation/DocBook/media/dvb/dvbproperty.xml +++ b/trunk/Documentation/DocBook/media/dvb/dvbproperty.xml @@ -352,6 +352,7 @@ typedef enum fe_delivery_system { SYS_CMMB, SYS_DAB, SYS_DVBT2, + SYS_TURBO, } fe_delivery_system_t; diff --git a/trunk/include/linux/dvb/frontend.h b/trunk/include/linux/dvb/frontend.h index 36a3ed63f571..1b1094c35e4f 100644 --- a/trunk/include/linux/dvb/frontend.h +++ b/trunk/include/linux/dvb/frontend.h @@ -349,6 +349,7 @@ typedef enum fe_delivery_system { SYS_CMMB, SYS_DAB, SYS_DVBT2, + SYS_TURBO, } fe_delivery_system_t; struct dtv_cmds_h {