Merge branch 'wl12xx-next' into for-linville

[~andy/linux] / drivers / net / wireless / ti / wlcore / wlcore.h

diff --git a/drivers/net/wireless/ti/wlcore/wlcore.h b/drivers/net/wireless/ti/wlcore/wlcore.h
index 118208a8e9970891f70d8603b20c8663faa7ef61..ebd8c6fad7cdda4b474bd0e49abb62dc05cf9666 100644 (file)
--- a/drivers/net/wireless/ti/wlcore/wlcore.h
+++ b/drivers/net/wireless/ti/wlcore/wlcore.h
@@ -469,8 +469,8 @@ struct wl1271 {
        u32 num_channels;
 };
 
-int __devinit wlcore_probe(struct wl1271 *wl, struct platform_device *pdev);
-int __devexit wlcore_remove(struct platform_device *pdev);
+int wlcore_probe(struct wl1271 *wl, struct platform_device *pdev);
+int wlcore_remove(struct platform_device *pdev);
 struct ieee80211_hw *wlcore_alloc_hw(size_t priv_size, u32 aggr_buf_size,
                                     u32 mbox_size);
 int wlcore_free_hw(struct wl1271 *wl);