diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-22 04:28:56 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-22 04:28:56 -0400 |
| commit | 65c2ce70046c779974af8b5dfc25a0df489089b5 (patch) | |
| tree | b16f152eb62b71cf5a1edc51da865b357c989922 /drivers/net/wireless/ath/ath9k/ath9k.h | |
| parent | 842514849a616e9b61acad65771c7afe01e651f9 (diff) | |
| parent | 4b660a7f5c8099d88d1a43d8ae138965112592c7 (diff) | |
Merge tag 'v3.15-rc6' into sched/core, to pick up the latest fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/ath9k.h')
| -rw-r--r-- | drivers/net/wireless/ath/ath9k/ath9k.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index 44d74495c4de..3ba03dde4215 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h | |||
| @@ -251,7 +251,6 @@ struct ath_atx_tid { | |||
| 251 | 251 | ||
| 252 | s8 bar_index; | 252 | s8 bar_index; |
| 253 | bool sched; | 253 | bool sched; |
| 254 | bool paused; | ||
| 255 | bool active; | 254 | bool active; |
| 256 | }; | 255 | }; |
| 257 | 256 | ||