diff options
| author | Luciano Coelho | 2011-12-08 12:08:10 +0100 |
|---|---|---|
| committer | Luciano Coelho | 2011-12-08 12:08:10 +0100 |
| commit | f589cf4f2ccdc670ef6d7c30d87f9a3e9dfa4d9d (patch) | |
| tree | 4eddd981d5fb92e4570e6f1814a9aa192c5ad3e8 /include | |
| parent | wireless: disable wext sysfs by default (diff) | |
| parent | wl12xx: minor fix in sched_scan_ssid_list (diff) | |
| download | kernel-qcow2-linux-f589cf4f2ccdc670ef6d7c30d87f9a3e9dfa4d9d.tar.gz kernel-qcow2-linux-f589cf4f2ccdc670ef6d7c30d87f9a3e9dfa4d9d.tar.xz kernel-qcow2-linux-f589cf4f2ccdc670ef6d7c30d87f9a3e9dfa4d9d.zip | |
Merge branch 'wl12xx-next' into for-linville
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/wl12xx.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h index 4b697395326e..0d6373195d32 100644 --- a/include/linux/wl12xx.h +++ b/include/linux/wl12xx.h @@ -54,6 +54,9 @@ struct wl12xx_platform_data { int board_ref_clock; int board_tcxo_clock; unsigned long platform_quirks; + bool pwr_in_suspend; + + struct wl1271_if_operations *ops; }; /* Platform does not support level trigger interrupts */ @@ -73,6 +76,6 @@ int wl12xx_set_platform_data(const struct wl12xx_platform_data *data) #endif -const struct wl12xx_platform_data *wl12xx_get_platform_data(void); +struct wl12xx_platform_data *wl12xx_get_platform_data(void); #endif |