From 50c8edc857d494fb669f34326094cca5547f9527 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 2 May 2011 18:06:41 -0700 Subject: [PATCH] net: wireless: bcm4329: Fix one more 2.6.39 compilation error Change-Id: Ia290e056a177d0e6f84a3cf9e806307b43de5e1b Signed-off-by: Colin Cross --- drivers/net/wireless/bcm4329/dhd_linux.c | 2 ++ 1 file changed, 2 insertions(+) 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; } -- 2.7.4