diff --git a/[refs] b/[refs] index 39f9e1c58cb0..0d81af1d2605 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d3b2c172518dceed0d1d68f5b90dde5a2f6a438d +refs/heads/master: 70f9f79c481d41f9a18b29aff9859534d6868d4c diff --git a/trunk/drivers/staging/rtl8192e/r8190P_def.h b/trunk/drivers/staging/rtl8192e/r8190P_def.h index a1b49674d96c..87d91e2cf2b3 100644 --- a/trunk/drivers/staging/rtl8192e/r8190P_def.h +++ b/trunk/drivers/staging/rtl8192e/r8190P_def.h @@ -29,12 +29,12 @@ #define RX_CMD_QUEUE 1 -typedef enum _rtl819x_loopback_e{ +enum rtl819x_loopback { RTL819X_NO_LOOPBACK = 0, RTL819X_MAC_LOOPBACK = 1, RTL819X_DMA_LOOPBACK = 2, RTL819X_CCK_LOOPBACK = 3, -} rtl819x_loopback_e; +}; #define RESET_DELAY_8185 20 diff --git a/trunk/drivers/staging/rtl8192e/rtl_core.h b/trunk/drivers/staging/rtl8192e/rtl_core.h index 16fbb933c76f..31279a95ac8c 100644 --- a/trunk/drivers/staging/rtl8192e/rtl_core.h +++ b/trunk/drivers/staging/rtl8192e/rtl_core.h @@ -601,7 +601,7 @@ struct r8192_priv { ACM_METHOD AcmMethod; struct rt_firmware *pFirmware; - rtl819x_loopback_e LoopbackMode; + enum rtl819x_loopback LoopbackMode; firmware_source_e firmware_source; struct timer_list watch_dog_timer;