diff options
| author | David S. Miller <davem@davemloft.net> | 2011-05-05 17:09:28 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-05-05 17:09:28 -0400 |
| commit | 90864fbc7639d7a2300c67a18c9fb9fbcf7d51d2 (patch) | |
| tree | 6951c8d0e529dbfc7c4cec75d4cec63350e39b7c /drivers/net/wireless/wl12xx/io.h | |
| parent | 228e548e602061b08ee8e8966f567c12aa079682 (diff) | |
| parent | a70171dce9cd44cb06c7d299eba9fa87a8933045 (diff) | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/wl12xx/io.h')
| -rw-r--r-- | drivers/net/wireless/wl12xx/io.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/io.h b/drivers/net/wireless/wl12xx/io.h index 00c771ea70bf..beed621a8ae0 100644 --- a/drivers/net/wireless/wl12xx/io.h +++ b/drivers/net/wireless/wl12xx/io.h | |||
| @@ -169,5 +169,8 @@ int wl1271_init_ieee80211(struct wl1271 *wl); | |||
| 169 | struct ieee80211_hw *wl1271_alloc_hw(void); | 169 | struct ieee80211_hw *wl1271_alloc_hw(void); |
| 170 | int wl1271_free_hw(struct wl1271 *wl); | 170 | int wl1271_free_hw(struct wl1271 *wl); |
| 171 | irqreturn_t wl1271_irq(int irq, void *data); | 171 | irqreturn_t wl1271_irq(int irq, void *data); |
| 172 | bool wl1271_set_block_size(struct wl1271 *wl); | ||
| 173 | int wl1271_tx_dummy_packet(struct wl1271 *wl); | ||
| 174 | void wl1271_configure_filters(struct wl1271 *wl, unsigned int filters); | ||
| 172 | 175 | ||
| 173 | #endif | 176 | #endif |