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>

diff --git a/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h b/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
index 598cecc63f41a554c362e218b2ab92e1e358bc64..72a3d5497547e53b6b6aba28f65971c6a2213cb3 100644 (file)
--- a/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
+++ b/drivers/net/wireless/rtlwifi/rtl8192ce/reg.h
@@ -1203,7 +1203,9 @@
 #define EPROM_CMD_CONFIG                       0x3
 #define EPROM_CMD_LOAD                         1
 
+#define HWSET_MAX_SIZE                         128
 #define        HWSET_MAX_SIZE_92S                      HWSET_MAX_SIZE
+#define EFUSE_MAX_SECTION                      16
 
 #define        WL_HWPDN_EN                             BIT(0)
 

diff --git a/drivers/net/wireless/rtlwifi/wifi.h b/drivers/net/wireless/rtlwifi/wifi.h
index c54cda5ce22ada8948e16605d6ef7122c89bee04..491e97fc03438e0cebfc9b2924f0bc63084c0f2b 100644 (file)
--- a/drivers/net/wireless/rtlwifi/wifi.h
+++ b/drivers/net/wireless/rtlwifi/wifi.h
@@ -303,9 +303,6 @@ enum hw_variables {
        HW_VAR_DATA_FILTER,
 };
 
-#define HWSET_MAX_SIZE                         128
-#define EFUSE_MAX_SECTION                      16
-
 enum _RT_MEDIA_STATUS {
        RT_MEDIA_DISCONNECT = 0,
        RT_MEDIA_CONNECT = 1