diff --git a/[refs] b/[refs] index cd76dd42b67d..3359bdac69cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b40d29e0afac38f4ce6cb1db400a60f36c5cabee +refs/heads/master: a52f68c648585ff615175269d8f6cbcbb08d7f4d diff --git a/trunk/include/linux/dvb/frontend.h b/trunk/include/linux/dvb/frontend.h index e185627219e3..6e4ace270276 100644 --- a/trunk/include/linux/dvb/frontend.h +++ b/trunk/include/linux/dvb/frontend.h @@ -284,9 +284,9 @@ typedef enum fe_pilot { } fe_pilot_t; typedef enum fe_rolloff { + ROLLOFF_35, /* Implied value in DVB-S, default for DVB-S2 */ ROLLOFF_20, ROLLOFF_25, - ROLLOFF_35, ROLLOFF_AUTO, } fe_rolloff_t;