ARM: OMAP2+: Fix booting with configs that don't have MFD_SYSCON

[firefly-linux-kernel-4.4.55.git] / drivers / staging / vt6655 / device.h

diff --git a/drivers/staging/vt6655/device.h b/drivers/staging/vt6655/device.h
index 83efbfb57c798ef2189aa73e67ff2afbb48ba160..440537e47121b926a076f42aef0f09e9807f37c2 100644 (file)
--- a/drivers/staging/vt6655/device.h
+++ b/drivers/staging/vt6655/device.h
@@ -367,7 +367,7 @@ struct vnt_private {
        bool bIsBeaconBufReadySet;
        unsigned int    cbBeaconBufReadySetCnt;
        bool bFixRate;
-       unsigned char byCurrentCh;
+       u16 byCurrentCh;
 
        bool bAES;
 
@@ -407,29 +407,6 @@ struct vnt_private {
        unsigned char byBBCR88;
        unsigned char byBBCR09;
 
-       bool bDiversityRegCtlON;
-       bool bDiversityEnable;
-       unsigned long ulDiversityNValue;
-       unsigned long ulDiversityMValue;
-       unsigned char byTMax;
-       unsigned char byTMax2;
-       unsigned char byTMax3;
-       unsigned long ulSQ3TH;
-
-       /* ANT diversity */
-       unsigned long uDiversityCnt;
-       unsigned char byAntennaState;
-       unsigned long ulRatio_State0;
-       unsigned long ulRatio_State1;
-
-       /* SQ3 functions for antenna diversity */
-       struct timer_list           TimerSQ3Tmax1;
-       struct timer_list           TimerSQ3Tmax2;
-       struct timer_list           TimerSQ3Tmax3;
-
-       unsigned long uNumSQ3[MAX_RATE];
-       unsigned short wAntDiversityMaxRate;
-
        unsigned char abyEEPROM[EEP_MAX_CONTEXT_SIZE]; /* unsigned long alignment */
 
        unsigned short wBeaconInterval;