diff options
| author | John W. Linville <linville@tuxdriver.com> | 2010-10-05 13:50:27 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2010-10-05 13:50:27 -0400 |
| commit | 46bf695802bb090d9d0d0fec6bb5b46c24b17d4e (patch) | |
| tree | 788afdbec413608f6331ffbac4153f0f6736e6b7 /include/linux | |
| parent | e7480bbb926c5816e4fbfca70748096bbe0e4978 (diff) | |
| parent | 4b48e6876b641e1138f37a0fc11fb6a4fc3e24e1 (diff) | |
Merge branch 'wireless-next' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/wl12xx.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h index 95deae3968f4..4f902e1908aa 100644 --- a/include/linux/wl12xx.h +++ b/include/linux/wl12xx.h | |||
| @@ -32,7 +32,20 @@ struct wl12xx_platform_data { | |||
| 32 | int board_ref_clock; | 32 | int board_ref_clock; |
| 33 | }; | 33 | }; |
| 34 | 34 | ||
| 35 | #ifdef CONFIG_WL12XX_PLATFORM_DATA | ||
| 36 | |||
| 35 | int wl12xx_set_platform_data(const struct wl12xx_platform_data *data); | 37 | int wl12xx_set_platform_data(const struct wl12xx_platform_data *data); |
| 38 | |||
| 39 | #else | ||
| 40 | |||
| 41 | static inline | ||
| 42 | int wl12xx_set_platform_data(const struct wl12xx_platform_data *data) | ||
| 43 | { | ||
| 44 | return -ENOSYS; | ||
| 45 | } | ||
| 46 | |||
| 47 | #endif | ||
| 48 | |||
| 36 | const struct wl12xx_platform_data *wl12xx_get_platform_data(void); | 49 | const struct wl12xx_platform_data *wl12xx_get_platform_data(void); |
| 37 | 50 | ||
| 38 | #endif | 51 | #endif |