diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-02-21 10:42:36 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2011-02-21 10:42:36 +0530 |
| commit | 65aaf50c61234103c3d9359dd8d4558306a262f8 (patch) | |
| tree | 0c54a9223543b6f1ec901c388b0bf808fbbfbe83 /include | |
| parent | e96fe79f41c61ade25b0d4f28e5caf92e802eda1 (diff) | |
| parent | 01de8cb7aaf15245338261b25531736030be4063 (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
drivers/net/wireless/bcm4329/Makefile
Change-Id: I5e6994d4db216062b9cd1673f45bd9fdcf1f96ae
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/wlan_plat.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/wlan_plat.h b/include/linux/wlan_plat.h index 3b1e2e054fd5..40ec3482d1ef 100644 --- a/include/linux/wlan_plat.h +++ b/include/linux/wlan_plat.h @@ -21,6 +21,7 @@ struct wifi_platform_data { int (*set_carddetect)(int val); void *(*mem_prealloc)(int section, unsigned long size); int (*get_mac_addr)(unsigned char *buf); + void *(*get_country_code)(char *ccode); }; #endif |