Merge branches 'x86/numa-fixes', 'x86/apic', 'x86/apm', 'x86/bitops', 'x86/build...

[~andy/linux] / drivers / net / wireless / rtl8187.h

diff --git a/drivers/net/wireless/rtl8187.h b/drivers/net/wireless/rtl8187.h
index 6ad322ef0da13a974a8cb6c7793239213fb9123b..076d88b6db0e9f69c23d3e952af95b03097a549f 100644 (file)
--- a/drivers/net/wireless/rtl8187.h
+++ b/drivers/net/wireless/rtl8187.h
@@ -64,14 +64,14 @@ struct rtl8187_tx_hdr {
 struct rtl8187_priv {
        /* common between rtl818x drivers */
        struct rtl818x_csr *map;
-       void (*rf_init)(struct ieee80211_hw *);
+       const struct rtl818x_rf_ops *rf;
+       struct ieee80211_vif *vif;
        int mode;
-       int if_id;
 
        /* rtl8187 specific */
        struct ieee80211_channel channels[14];
        struct ieee80211_rate rates[12];
-       struct ieee80211_hw_mode modes[2];
+       struct ieee80211_supported_band band;
        struct usb_device *udev;
        u32 rx_conf;
        u16 txpwr_base;