diff options
| author | Rebecca Schultz Zavin <rebecca@android.com> | 2011-02-16 09:56:33 -0800 |
|---|---|---|
| committer | Rebecca Schultz Zavin <rebecca@android.com> | 2011-02-16 09:56:33 -0800 |
| commit | fd57a71c00ece424649b261ee786264b3ac5b5f5 (patch) | |
| tree | 0b00ed3852ea7800e88699ea8e5d667f0e0ad01d /include | |
| parent | 21cc82b575b16307184369646e98afc1116f6db9 (diff) | |
| parent | 696ecacfc59e5a8e822afb6a8f92b35cfdcabb63 (diff) | |
Merge remote branch 'common/android-2.6.36' into android-tegra-2.6.36
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 |