diff options
| author | David S. Miller <davem@davemloft.net> | 2010-07-14 01:25:13 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-07-14 01:25:13 +0400 |
| commit | fae88f7eedae42c955075aec7a0cd27545f81511 (patch) | |
| tree | a14895b1d5d5881dfb9eddb23a2ab270e14dc4a7 /drivers/net/wireless/wl12xx/wl1271_boot.c | |
| parent | 1e2cfeef060fa0270f9a2d66b1218c12c05062e0 (diff) | |
| parent | e300d955debdadf599c36e47eb0bc16f5976215c (diff) | |
| download | linux-fae88f7eedae42c955075aec7a0cd27545f81511.tar.xz | |
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/wl1271_boot.c')
| -rw-r--r-- | drivers/net/wireless/wl12xx/wl1271_boot.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1271_boot.c b/drivers/net/wireless/wl12xx/wl1271_boot.c index 1a36d8a2196e..f36430b0336d 100644 --- a/drivers/net/wireless/wl12xx/wl1271_boot.c +++ b/drivers/net/wireless/wl12xx/wl1271_boot.c @@ -414,7 +414,9 @@ static int wl1271_boot_run_firmware(struct wl1271 *wl) PS_REPORT_EVENT_ID | JOIN_EVENT_COMPLETE_ID | DISCONNECT_EVENT_COMPLETE_ID | - RSSI_SNR_TRIGGER_0_EVENT_ID; + RSSI_SNR_TRIGGER_0_EVENT_ID | + PSPOLL_DELIVERY_FAILURE_EVENT_ID | + SOFT_GEMINI_SENSE_EVENT_ID; ret = wl1271_event_unmask(wl); if (ret < 0) { |