Merge branch 'master' into for-next

[firefly-linux-kernel-4.4.55.git] / include / linux / wl12xx.h

diff --git a/include/linux/wl12xx.h b/include/linux/wl12xx.h
index bd70563107fa77f97fca284b39f747cb149fd714..4f902e1908aaa191095c2f90741f96679b4b3113 100644 (file)
--- a/include/linux/wl12xx.h
+++ b/include/linux/wl12xx.h
@@ -29,9 +29,23 @@ struct wl12xx_platform_data {
        /* SDIO only: IRQ number if WLAN_IRQ line is used, 0 for SDIO IRQs */
        int irq;
        bool use_eeprom;
+       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