Merge remote branch 'origin/master' into qcdm

2 files changed, 2 insertions, 2 deletions

diff --git a/src/mm-generic-cdma.c b/src/mm-generic-cdma.c
index d598f62a..3dde2097 100644
--- a/src/mm-generic-cdma.c
+++ b/src/mm-generic-cdma.c
@@ -28,6 +28,8 @@
 #include "mm-callback-info.h"
 #include "mm-serial-parsers.h"
 
+#define MM_GENERIC_CDMA_PREV_STATE_TAG "prev-state"
+
 static void simple_reg_callback (MMModemCdma *modem,
                                  MMModemCdmaRegistrationState cdma_1x_reg_state,
                                  MMModemCdmaRegistrationState evdo_reg_state,
diff --git a/src/mm-generic-cdma.h b/src/mm-generic-cdma.h
index dd3aba69..18e1d61d 100644
--- a/src/mm-generic-cdma.h
+++ b/src/mm-generic-cdma.h
@@ -71,8 +71,6 @@ MMModem *mm_generic_cdma_new (const char *device,
 
 /* Private, for subclasses */
 
-#define MM_GENERIC_CDMA_PREV_STATE_TAG "prev-state"
-
 MMPort * mm_generic_cdma_grab_port (MMGenericCdma *self,
                                     const char *subsys,
                                     const char *name,