OSDN Git Service
(root)
/
android-x86
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
854c066
)
net: wireless: bcm4329: Fix one more 2.6.39 compilation error
author
Colin Cross
<ccross@android.com>
Tue, 3 May 2011 01:06:41 +0000
(18:06 -0700)
committer
Iliyan Malchev
<malchev@google.com>
Mon, 23 May 2011 22:44:04 +0000
(15:44 -0700)
Change-Id: Ia290e056a177d0e6f84a3cf9e806307b43de5e1b
Signed-off-by: Colin Cross <ccross@android.com>
drivers/net/wireless/bcm4329/dhd_linux.c
patch
|
blob
|
history
diff --git
a/drivers/net/wireless/bcm4329/dhd_linux.c
b/drivers/net/wireless/bcm4329/dhd_linux.c
index
88c573a
..
f1a25fe
100644
(file)
--- 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;
}