From: Colin Cross <ccross@android.com>
Date: Tue, 3 May 2011 01:06:41 +0000 (-0700)
Subject: net: wireless: bcm4329: Fix one more 2.6.39 compilation error
X-Git-Tag: firefly_0821_release~7613^2~642
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=9938b0239e1f0846e2d1347d9a765d86d3b521dd;p=firefly-linux-kernel-4.4.55.git

net: wireless: bcm4329: Fix one more 2.6.39 compilation error

Change-Id: Ia290e056a177d0e6f84a3cf9e806307b43de5e1b
Signed-off-by: Colin Cross <ccross@android.com>
---

diff --git a/drivers/net/wireless/bcm4329/dhd_linux.c b/drivers/net/wireless/bcm4329/dhd_linux.c
index 88c573a49102..f1a25fe1e1db 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;
 }