diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-02 18:49:32 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-09-02 18:49:32 +1000 |
| commit | ba4ccd8831a8174e533cb02d03134a512e4ea79b (patch) | |
| tree | b3be2e92ab11ef568ff5ccba47989e6d5950222c /drivers/staging/rt2860/rtmp_def.h | |
| parent | c23553f91afc3d030b45bfbf637a08698558ff9b (diff) | |
| parent | a6ab2b64c43054920f41332ab12e853997d467cf (diff) | |
Merge branch 'quilt/staging'
Conflicts:
drivers/staging/epl/VirtualEthernetLinux.c
Diffstat (limited to 'drivers/staging/rt2860/rtmp_def.h')
| -rw-r--r-- | drivers/staging/rt2860/rtmp_def.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/drivers/staging/rt2860/rtmp_def.h b/drivers/staging/rt2860/rtmp_def.h index 5dde860cbbd4..f5fee57fbe3e 100644 --- a/drivers/staging/rt2860/rtmp_def.h +++ b/drivers/staging/rt2860/rtmp_def.h @@ -148,11 +148,7 @@ #define MAX_PACKETS_IN_PS_QUEUE 128 //32 #define WMM_NUM_OF_AC 4 /* AC0, AC1, AC2, and AC3 */ -#ifdef RT30xx -//2008/09/11:KH add to support efuse<-- #define MAX_EEPROM_BIN_FILE_SIZE 1024 -//2008/09/11:KH add to support efuse--> -#endif // RxFilter #define STANORMAL 0x17f97 @@ -573,9 +569,6 @@ // For 802.11n D3.03 //#define IE_NEW_EXT_CHA_OFFSET 62 // 802.11n d1. New extension channel offset elemet #define IE_SECONDARY_CH_OFFSET 62 // 802.11n D3.03 Secondary Channel Offset element -#ifdef RT2870 -#define IE_WAPI 68 // WAPI information element -#endif #define IE_2040_BSS_COEXIST 72 // 802.11n D3.0.3 #define IE_2040_BSS_INTOLERANT_REPORT 73 // 802.11n D3.03 #define IE_OVERLAPBSS_SCAN_PARM 74 // 802.11n D3.03 @@ -624,11 +617,6 @@ #define AP_CNTL_STATE_MACHINE 15 #define AP_WPA_STATE_MACHINE 16 -#ifdef RT30xx -#define WSC_STATE_MACHINE 17 -#define WSC_UPNP_STATE_MACHINE 18 -#endif - // // STA's CONTROL/CONNECT state machine: states, events, total function # // @@ -1215,10 +1203,8 @@ #define RFIC_2750 4 // 2.4G/5G 1T2R #define RFIC_3020 5 // 2.4G 1T1R #define RFIC_2020 6 // 2.4G B/G -#ifdef RT30xx #define RFIC_3021 7 // 2.4G 1T2R #define RFIC_3022 8 // 2.4G 2T2R -#endif // LED Status. #define LED_LINK_DOWN 0 |