Merge branch 'wireless-next' of git://git.kernel.org/pub/scm/linux/kernel/git/luca/wl12xx

This commit is contained in:
John W. Linville 2010-10-05 13:50:27 -04:00
commit 46bf695802
23 changed files with 787 additions and 541 deletions

View file

@ -32,7 +32,20 @@ struct wl12xx_platform_data {
int board_ref_clock;
};
#ifdef CONFIG_WL12XX_PLATFORM_DATA
int wl12xx_set_platform_data(const struct wl12xx_platform_data *data);
#else
static inline
int wl12xx_set_platform_data(const struct wl12xx_platform_data *data)
{
return -ENOSYS;
}
#endif
const struct wl12xx_platform_data *wl12xx_get_platform_data(void);
#endif