diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-06-30 13:34:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-06-30 13:34:06 -0400 |
| commit | df2cbe40753dc36af294c30209ed909869aca6cf (patch) | |
| tree | 39eb7e8e06737b295007126f4e16c1b688427163 /drivers/net/wireless/rt2x00 | |
| parent | 1049f6413f6e52572a768ca1590fa479ef0a48e8 (diff) | |
| parent | 9a4ba833a2d0016cf836827e136f0c219834bd41 (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/rt2x00')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00queue.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00queue.h b/drivers/net/wireless/rt2x00/rt2x00queue.h index 167d45873dca..590047499e3c 100644 --- a/drivers/net/wireless/rt2x00/rt2x00queue.h +++ b/drivers/net/wireless/rt2x00/rt2x00queue.h | |||
| @@ -54,7 +54,7 @@ | |||
| 54 | * @QID_RX: RX queue | 54 | * @QID_RX: RX queue |
| 55 | * @QID_OTHER: None of the above (don't use, only present for completeness) | 55 | * @QID_OTHER: None of the above (don't use, only present for completeness) |
| 56 | * @QID_BEACON: Beacon queue (value unspecified, don't send it to device) | 56 | * @QID_BEACON: Beacon queue (value unspecified, don't send it to device) |
| 57 | * @QID_ATIM: Atim queue (value unspeficied, don't send it to device) | 57 | * @QID_ATIM: Atim queue (value unspecified, don't send it to device) |
| 58 | */ | 58 | */ |
| 59 | enum data_queue_qid { | 59 | enum data_queue_qid { |
| 60 | QID_AC_VO = 0, | 60 | QID_AC_VO = 0, |