diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-07-08 17:03:36 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-07-08 17:03:36 +0200 |
| commit | 204d1641d200709c759d8c269458cbc7de378c40 (patch) | |
| tree | ce88690b4422078883f1651537ccd1f5d8ed7258 /drivers/net/wireless/ipw2x00 | |
| parent | packet: Fix build with INET disabled. (diff) | |
| parent | rt2x00: Implement tx_frames_pending mac80211 callback function. (diff) | |
| download | linux-204d1641d200709c759d8c269458cbc7de378c40.tar.xz linux-204d1641d200709c759d8c269458cbc7de378c40.zip | |
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/ipw2x00')
| -rw-r--r-- | drivers/net/wireless/ipw2x00/ipw2100.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index 44307753587d..3774dd034746 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c @@ -287,7 +287,7 @@ static const char *command_types[] = { "unused", /* HOST_INTERRUPT_COALESCING */ "undefined", "CARD_DISABLE_PHY_OFF", - "MSDU_TX_RATES" "undefined", + "MSDU_TX_RATES", "undefined", "SET_STATION_STAT_BITS", "CLEAR_STATIONS_STAT_BITS", |