aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/bcm4329
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2011-05-02 18:06:41 -0700
committerColin Cross <ccross@android.com>2011-06-14 09:09:58 -0700
commit9938b0239e1f0846e2d1347d9a765d86d3b521dd (patch)
treeb7a7e887fac271d0c6e140a7535e24a233431bc8 /drivers/net/wireless/bcm4329
parentc473cbb8678058b863333163d7a65f3213893d1d (diff)
downloadkernel_samsung_aries-9938b0239e1f0846e2d1347d9a765d86d3b521dd.zip
kernel_samsung_aries-9938b0239e1f0846e2d1347d9a765d86d3b521dd.tar.gz
kernel_samsung_aries-9938b0239e1f0846e2d1347d9a765d86d3b521dd.tar.bz2
net: wireless: bcm4329: Fix one more 2.6.39 compilation error
Change-Id: Ia290e056a177d0e6f84a3cf9e806307b43de5e1b Signed-off-by: Colin Cross <ccross@android.com>
Diffstat (limited to 'drivers/net/wireless/bcm4329')
-rw-r--r--drivers/net/wireless/bcm4329/dhd_linux.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/wireless/bcm4329/dhd_linux.c b/drivers/net/wireless/bcm4329/dhd_linux.c
index 88c573a..f1a25fe 100644
--- a/drivers/net/wireless/bcm4329/dhd_linux.c
+++ b/drivers/net/wireless/bcm4329/dhd_linux.c
@@ -136,11 +136,13 @@ int wifi_get_mac_addr(unsigned char *buf)
void *wifi_get_country_code(char *ccode)
{
DHD_TRACE(("%s\n", __FUNCTION__));
+#ifdef CONFIG_WIFI_CONTROL_FUNC
if (!ccode)
return NULL;
if (wifi_control_data && wifi_control_data->get_country_code) {
return wifi_control_data->get_country_code(ccode);
}
+#endif
return NULL;
}