From da88fb868ea28a32044cc639b33db9ecb9b39bd9 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Tue, 19 Jul 2011 13:11:41 -0500 Subject: [PATCH] --- yaml --- r: 267813 b: refs/heads/master c: cec076954213e2fa72991512d557fb37376055c0 h: refs/heads/master i: 267811: 22e1af7f4bfb9c6027201c36445574cacc74ecf3 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rtl8192e/r8192E_firmware.c | 2 +- trunk/drivers/staging/rtl8192e/r8192E_firmware.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fecf20edbf30..d56b60681ceb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8fa81ed4c99eadf09c112187e9275aacd0ae1836 +refs/heads/master: cec076954213e2fa72991512d557fb37376055c0 diff --git a/trunk/drivers/staging/rtl8192e/r8192E_firmware.c b/trunk/drivers/staging/rtl8192e/r8192E_firmware.c index 7d2042194089..125d66e19144 100644 --- a/trunk/drivers/staging/rtl8192e/r8192E_firmware.c +++ b/trunk/drivers/staging/rtl8192e/r8192E_firmware.c @@ -267,7 +267,7 @@ bool init_firmware(struct net_device *dev) u8 *mapped_file = NULL; u8 init_step = 0; opt_rst_type_e rst_opt = OPT_SYSTEM_RESET; - firmware_init_step_e starting_state = FW_INIT_STEP0_BOOT; + enum firmware_init_step starting_state = FW_INIT_STEP0_BOOT; struct rt_firmware *pfirmware = priv->pFirmware; diff --git a/trunk/drivers/staging/rtl8192e/r8192E_firmware.h b/trunk/drivers/staging/rtl8192e/r8192E_firmware.h index 64cc3627d1b0..52b1f342fdee 100644 --- a/trunk/drivers/staging/rtl8192e/r8192E_firmware.h +++ b/trunk/drivers/staging/rtl8192e/r8192E_firmware.h @@ -23,11 +23,11 @@ #define GET_COMMAND_PACKET_FRAG_THRESHOLD(v) (4*(v/4) - 8 ) -typedef enum _firmware_init_step_e{ +enum firmware_init_step { FW_INIT_STEP0_BOOT = 0, FW_INIT_STEP1_MAIN = 1, FW_INIT_STEP2_DATA = 2, -} firmware_init_step_e; +}; typedef enum _opt_rst_type_e{ OPT_SYSTEM_RESET = 0,