diff options
| author | Pekka Enberg <penberg@kernel.org> | 2012-01-11 14:11:29 -0500 |
|---|---|---|
| committer | Pekka Enberg <penberg@kernel.org> | 2012-01-11 14:11:29 -0500 |
| commit | 5878cf431ca7233a56819ca6970153ac0b129599 (patch) | |
| tree | e5d21d04a0b468d2dabbe3a3824f23b5537fc6a7 /drivers/net/wireless/rt2x00/rt2x00.h | |
| parent | 74ee4ef1f901fbb014bdcdc9171d126490ce2b62 (diff) | |
| parent | b13683d1cc14d1dd30b8e20f3ebea3f814ad029f (diff) | |
Merge branch 'slab/urgent' into slab/for-linus
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2x00.h')
| -rw-r--r-- | drivers/net/wireless/rt2x00/rt2x00.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2x00.h b/drivers/net/wireless/rt2x00/rt2x00.h index 2ec5c00235e6..99ff12d0c29d 100644 --- a/drivers/net/wireless/rt2x00/rt2x00.h +++ b/drivers/net/wireless/rt2x00/rt2x00.h | |||
| @@ -943,6 +943,7 @@ struct rt2x00_dev { | |||
| 943 | * Powersaving work | 943 | * Powersaving work |
| 944 | */ | 944 | */ |
| 945 | struct delayed_work autowakeup_work; | 945 | struct delayed_work autowakeup_work; |
| 946 | struct work_struct sleep_work; | ||
| 946 | 947 | ||
| 947 | /* | 948 | /* |
| 948 | * Data queue arrays for RX, TX, Beacon and ATIM. | 949 | * Data queue arrays for RX, TX, Beacon and ATIM. |