brcmfmac: switch to new platform data

[deliverable/linux.git] / drivers / net / wireless / broadcom / brcm80211 / brcmfmac / common.h

diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
index 3b0a63b98e998682c9654895c2f8ff6667e97bf0..a64e40e8bfda832ef1333dca0deb2367efc9095a 100644 (file)
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
@@ -15,6 +15,10 @@
 #ifndef BRCMFMAC_COMMON_H
 #define BRCMFMAC_COMMON_H
 
+#include <linux/platform_device.h>
+#include <linux/platform_data/brcmfmac.h>
+#include "fwil_types.h"
+
 extern const u8 ALLFFMAC[ETH_ALEN];
 
 #define BRCMF_FW_ALTPATH_LEN                   256
@@ -47,6 +51,7 @@ extern struct brcmf_mp_global_t brcmf_mp_global;
  * @feature_disable: Feature_disable bitmask.
  * @fcmode: FWS flow control.
  * @roamoff: Firmware roaming off?
+ * @country_codes: If available, pointer to struct for translating country codes
  */
 struct brcmf_mp_device {
        int     sdiod_txglomsz;
@@ -56,9 +61,12 @@ struct brcmf_mp_device {
        int     fcmode;
        bool    roamoff;
        bool    ignore_probe_fail;
+       struct brcmfmac_pd_cc *country_codes;
 };
 
-void brcmf_mp_attach(void);
+struct brcmfmac_sdio_pd *brcmf_get_module_param(struct device *dev,
+                                               enum brcmf_bus_type bus_type,
+                                               u32 chip, u32 chiprev);
 int brcmf_mp_device_attach(struct brcmf_pub *drvr);
 void brcmf_mp_device_detach(struct brcmf_pub *drvr);
 #ifdef DEBUG