diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-03-11 14:11:11 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-03-11 14:11:11 -0500 |
| commit | 409ec36c320d580a036045e603f96286c362c609 (patch) | |
| tree | 3dd9b3569799f7962b523a068052445e2d2c51aa /drivers/net/wireless/wl12xx/io.h | |
| parent | 1b7fe59322bef9e7a2c05b64a07a66b875299736 (diff) | |
| parent | 8d5eab5aa676378b4c9daa62d10d08a0bca04677 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'drivers/net/wireless/wl12xx/io.h')
| -rw-r--r-- | drivers/net/wireless/wl12xx/io.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/wl12xx/io.h b/drivers/net/wireless/wl12xx/io.h index 844b32b170bb..c1aac8292089 100644 --- a/drivers/net/wireless/wl12xx/io.h +++ b/drivers/net/wireless/wl12xx/io.h @@ -168,5 +168,6 @@ void wl1271_unregister_hw(struct wl1271 *wl); int wl1271_init_ieee80211(struct wl1271 *wl); struct ieee80211_hw *wl1271_alloc_hw(void); int wl1271_free_hw(struct wl1271 *wl); +irqreturn_t wl1271_irq(int irq, void *data); #endif |