Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / staging / rt2860 / chips / rt3090.c

diff --git a/drivers/staging/rt2860/chips/rt3090.c b/drivers/staging/rt2860/chips/rt3090.c
index c2933c69bc0476fea8e2d12a498f4aa34a2c4847..334720ee134511a44d28a6816d311604da7c9ef9 100644 (file)
--- a/drivers/staging/rt2860/chips/rt3090.c
+++ b/drivers/staging/rt2860/chips/rt3090.c
@@ -28,10 +28,11 @@
        rt3090.c
 
        Abstract:
-       Specific funcitons and variables for RT3070
+       Specific functions and variables for RT3070
 
        Revision History:
-       Who         When          What
+       Who                     When            What
+       Justin P. Mattock       11/07/2010      Fix a typo
        --------    ----------    ----------------------------------------------
 */
 
@@ -51,7 +52,8 @@ void NICInitRT3090RFRegisters(struct rt_rtmp_adapter *pAd)
        if (IS_RT3090(pAd)) {
                /* Init RF calibration */
                /* Driver should toggle RF R30 bit7 before init RF registers */
-               u32 RfReg = 0, data;
+               u8 RfReg;
+               u32 data;
 
                RT30xxReadRFRegister(pAd, RF_R30, (u8 *)&RfReg);
                RfReg |= 0x80;