From 45a25dbf9e29f45b32f2757cfa0b316a70580d8f Mon Sep 17 00:00:00 2001
From: Pascal Quantin <pascal.quantin@gmail.com>
Date: Mon, 20 Aug 2012 09:28:01 +0000
Subject: Avoid defining 2 entries with incompatible types (FT_BYTES vs
 FT_NONE) and same filter

svn path=/trunk/; revision=44595
---
 epan/dissectors/packet-gsm_map.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'epan/dissectors/packet-gsm_map.c')

diff --git a/epan/dissectors/packet-gsm_map.c b/epan/dissectors/packet-gsm_map.c
index 78650712be..7bacbe6dc8 100644
--- a/epan/dissectors/packet-gsm_map.c
+++ b/epan/dissectors/packet-gsm_map.c
@@ -22990,7 +22990,7 @@ void proto_register_gsm_map(void) {
         FT_UINT32, BASE_DEC, VALS(gsm_map_ms_DomainType_vals), 0,
         "DomainType", HFILL }},
     { &hf_gsm_map_ms_imei_01,
-      { "imei", "gsm_map.ms.imei",
+      { "imei", "gsm_map.ms.imei_null",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
     { &hf_gsm_map_ms_ms_classmark,
-- 
cgit v1.2.3