diff options
author | Larry Finger <Larry.Finger@lwfinger.net> | 2011-06-10 16:11:55 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2011-06-27 15:09:38 -0400 |
commit | f34317db363636b50750d39e8a75873d4ee64cfa (patch) | |
tree | c3331c80ac8040ae39d7dacfb398ae0972cd8417 /drivers/net/wireless | |
parent | 674f0523ec07a7c716f5ed8a2debe6632be750f8 (diff) |
rtlwifi: Fix build problems introduced by merging rtl8192de
These patches allow compilation of rtlwifi, rtl8192c_common,
rtl8192ce, rtl8192cu and rtl8192se to compile after rtl8192de
was added.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | 2 | ||||
-rw-r--r-- | drivers/net/wireless/rtlwifi/wifi.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h b/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h index 598cecc63f4..72a3d549754 100644 --- a/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h +++ b/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h | |||
@@ -1203,7 +1203,9 @@ | |||
1203 | #define EPROM_CMD_CONFIG 0x3 | 1203 | #define EPROM_CMD_CONFIG 0x3 |
1204 | #define EPROM_CMD_LOAD 1 | 1204 | #define EPROM_CMD_LOAD 1 |
1205 | 1205 | ||
1206 | #define HWSET_MAX_SIZE 128 | ||
1206 | #define HWSET_MAX_SIZE_92S HWSET_MAX_SIZE | 1207 | #define HWSET_MAX_SIZE_92S HWSET_MAX_SIZE |
1208 | #define EFUSE_MAX_SECTION 16 | ||
1207 | 1209 | ||
1208 | #define WL_HWPDN_EN BIT(0) | 1210 | #define WL_HWPDN_EN BIT(0) |
1209 | 1211 | ||
diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h index c54cda5ce22..491e97fc034 100644 --- a/drivers/net/wireless/rtlwifi/wifi.h +++ b/drivers/net/wireless/rtlwifi/wifi.h | |||
@@ -303,9 +303,6 @@ enum hw_variables { | |||
303 | HW_VAR_DATA_FILTER, | 303 | HW_VAR_DATA_FILTER, |
304 | }; | 304 | }; |
305 | 305 | ||
306 | #define HWSET_MAX_SIZE 128 | ||
307 | #define EFUSE_MAX_SECTION 16 | ||
308 | |||
309 | enum _RT_MEDIA_STATUS { | 306 | enum _RT_MEDIA_STATUS { |
310 | RT_MEDIA_DISCONNECT = 0, | 307 | RT_MEDIA_DISCONNECT = 0, |
311 | RT_MEDIA_CONNECT = 1 | 308 | RT_MEDIA_CONNECT = 1 |