Merge remote branch 'origin/master' into qcdm
This commit is contained in:
@@ -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,
|
||||
|
@@ -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,
|
||||
|
Reference in New Issue
Block a user