diff options
| author | John W. Linville | 2013-02-08 20:41:45 +0100 |
|---|---|---|
| committer | John W. Linville | 2013-02-08 20:41:45 +0100 |
| commit | 4d25a75bc6c3f71d8cd736cb5d9bb2ad4ba80792 (patch) | |
| tree | 12307df2501537577dfe12b5966c47a58166aef3 /include | |
| parent | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber... (diff) | |
| parent | wlcore: fix wrong remote rates when starting STA role (diff) | |
| download | kernel-qcow2-linux-4d25a75bc6c3f71d8cd736cb5d9bb2ad4ba80792.tar.gz kernel-qcow2-linux-4d25a75bc6c3f71d8cd736cb5d9bb2ad4ba80792.tar.xz kernel-qcow2-linux-4d25a75bc6c3f71d8cd736cb5d9bb2ad4ba80792.zip | |
Merge branch 'for-linville' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/wl12xx.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h index 0d6373195d32..a54fe82e704b 100644 --- a/include/linux/wl12xx.h +++ b/include/linux/wl12xx.h @@ -24,6 +24,8 @@ #ifndef _LINUX_WL12XX_H #define _LINUX_WL12XX_H +#include <linux/err.h> + /* Reference clock values */ enum { WL12XX_REFCLOCK_19 = 0, /* 19.2 MHz */ @@ -55,17 +57,17 @@ struct wl12xx_platform_data { int board_tcxo_clock; unsigned long platform_quirks; bool pwr_in_suspend; - - struct wl1271_if_operations *ops; }; /* Platform does not support level trigger interrupts */ #define WL12XX_PLATFORM_QUIRK_EDGE_IRQ BIT(0) -#ifdef CONFIG_WL12XX_PLATFORM_DATA +#ifdef CONFIG_WILINK_PLATFORM_DATA int wl12xx_set_platform_data(const struct wl12xx_platform_data *data); +struct wl12xx_platform_data *wl12xx_get_platform_data(void); + #else static inline @@ -74,8 +76,12 @@ int wl12xx_set_platform_data(const struct wl12xx_platform_data *data) return -ENOSYS; } -#endif +static inline +struct wl12xx_platform_data *wl12xx_get_platform_data(void) +{ + return ERR_PTR(-ENODATA); +} -struct wl12xx_platform_data *wl12xx_get_platform_data(void); +#endif #endif |