3 files changed, 13 insertions, 13 deletions

diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.c b/drivers/media/dvb/dvb-core/dvb_frontend.c
index 2aaaca620033..dc76f9935c81 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.c
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.c
@@ -829,9 +829,9 @@ struct dtv_cmds_h dtv_cmds[] = {
                 .cmd    = DTV_SET_DELIVERY_SYSTEM,
                 .set    = 1,
         },
-        [DTV_SET_ISDB_SEGMENT_NUM] = {
-                .name   = "DTV_SET_ISDB_SEGMENT_NUM",
-                .cmd    = DTV_SET_ISDB_SEGMENT_NUM,
+        [DTV_SET_ISDB_SEGMENT_IDX] = {
+                .name   = "DTV_SET_ISDB_SEGMENT_IDX",
+                .cmd    = DTV_SET_ISDB_SEGMENT_IDX,
                 .set    = 1,
         },
         [DTV_SET_ISDB_SEGMENT_WIDTH] = {
@@ -902,9 +902,9 @@ struct dtv_cmds_h dtv_cmds[] = {
                 .cmd    = DTV_GET_DELIVERY_SYSTEM,
                 .set    = 0,
         },
-        [DTV_GET_ISDB_SEGMENT_NUM] = {
-                .name   = "DTV_GET_ISDB_SEGMENT_NUM",
-                .cmd    = DTV_GET_ISDB_SEGMENT_NUM,
+        [DTV_GET_ISDB_SEGMENT_IDX] = {
+                .name   = "DTV_GET_ISDB_SEGMENT_IDX",
+                .cmd    = DTV_GET_ISDB_SEGMENT_IDX,
                 .set    = 0,
         },
         [DTV_GET_ISDB_SEGMENT_WIDTH] = {
@@ -1232,11 +1232,11 @@ int dtv_property_process(struct dvb_frontend *fe, struct dtv_property *tvp,
                 break;
 
         /* ISDB-T Support here */
-        case DTV_SET_ISDB_SEGMENT_NUM:
-                fe->dtv_property_cache.isdb_segment_num = tvp->u.data;
+        case DTV_SET_ISDB_SEGMENT_IDX:
+                fe->dtv_property_cache.isdb_segment_idx = tvp->u.data;
                 break;
-        case DTV_GET_ISDB_SEGMENT_NUM:
-                tvp->u.data = fe->dtv_property_cache.isdb_segment_num;
+        case DTV_GET_ISDB_SEGMENT_IDX:
+                tvp->u.data = fe->dtv_property_cache.isdb_segment_idx;
                 break;
         case DTV_SET_ISDB_SEGMENT_WIDTH:
                 fe->dtv_property_cache.isdb_segment_width = tvp->u.data;
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 85d30201a695..1c2090966baf 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -212,7 +212,7 @@ struct dtv_frontend_properties {
         fe_delivery_system_t    delivery_system;
 
         /* ISDB-T specifics */
-        u32                     isdb_segment_num;
+        u32                     isdb_segment_idx;
         u32                     isdb_segment_width;
         fe_code_rate_t          isdb_layera_fec;
         fe_modulation_t         isdb_layera_modulation;
diff --git a/include/linux/dvb/frontend.h b/include/linux/dvb/frontend.h
index 915edd319f34..e4f211735efb 100644
--- a/include/linux/dvb/frontend.h
+++ b/include/linux/dvb/frontend.h
@@ -288,8 +288,8 @@ typedef enum dtv_cmd_types {
         DTV_GET_DELIVERY_SYSTEM,
 
         /* ISDB-T */
-        DTV_SET_ISDB_SEGMENT_NUM,
-        DTV_GET_ISDB_SEGMENT_NUM,
+        DTV_SET_ISDB_SEGMENT_IDX,
+        DTV_GET_ISDB_SEGMENT_IDX,
         DTV_SET_ISDB_SEGMENT_WIDTH,
         DTV_GET_ISDB_SEGMENT_WIDTH,
         DTV_GET_ISDB_LAYERA_FEC,