diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/wireless/b43/phy_g.h | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/wireless/b43/phy_g.h')
| -rw-r--r-- | drivers/net/wireless/b43/phy_g.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/phy_g.h b/drivers/net/wireless/b43/phy_g.h index 8569fdd4c6be..5413c906a3e7 100644 --- a/drivers/net/wireless/b43/phy_g.h +++ b/drivers/net/wireless/b43/phy_g.h | |||
| @@ -164,7 +164,7 @@ struct b43_phy_g { | |||
| 164 | /* Current Interference Mitigation mode */ | 164 | /* Current Interference Mitigation mode */ |
| 165 | int interfmode; | 165 | int interfmode; |
| 166 | /* Stack of saved values from the Interference Mitigation code. | 166 | /* Stack of saved values from the Interference Mitigation code. |
| 167 | * Each value in the stack is layed out as follows: | 167 | * Each value in the stack is laid out as follows: |
| 168 | * bit 0-11: offset | 168 | * bit 0-11: offset |
| 169 | * bit 12-15: register ID | 169 | * bit 12-15: register ID |
| 170 | * bit 16-32: value | 170 | * bit 16-32: value |