diff options
| author | David S. Miller <davem@davemloft.net> | 2010-03-22 18:15:15 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-03-22 18:15:15 -0700 |
| commit | 33e2bf6aa16061bae1253514e7c32af27d2b4b31 (patch) | |
| tree | 652d13b4feea9a8f562186e7badae72d2e22fe1f /drivers/net/wireless/wl12xx/wl1271_boot.c | |
| parent | e880eb6c5c9d98e389ffc0d8947f75d70785361a (diff) | |
| parent | 819bfecc4fc6b6e5a793f719a45b7146ce423b79 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
Documentation/feature-removal-schedule.txt
drivers/net/wireless/ath/ath5k/phy.c
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1271_boot.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_boot.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_boot.c b/drivers/net/wireless/wl12xx/wl1271_boot.c index 2be76ee42bb..f88d52e87e8 100644 --- a/drivers/net/wireless/wl12xx/wl1271_boot.c +++ b/drivers/net/wireless/wl12xx/wl1271_boot.c @@ -26,7 +26,6 @@ #include "wl1271_acx.h" #include "wl1271_reg.h" #include "wl1271_boot.h" -#include "wl1271_spi.h" #include "wl1271_io.h" #include "wl1271_event.h" @@ -299,7 +298,7 @@ static int wl1271_boot_upload_nvs(struct wl1271 *wl) static void wl1271_boot_enable_interrupts(struct wl1271 *wl) { - enable_irq(wl->irq); + wl1271_enable_interrupts(wl); wl1271_write32(wl, ACX_REG_INTERRUPT_MASK, WL1271_ACX_INTR_ALL & ~(WL1271_INTR_MASK)); wl1271_write32(wl, HI_CFG, HI_CFG_DEF_VAL); |