diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-16 21:25:48 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-16 21:25:48 -0400 |
| commit | caea902f72b053fd0c76d0d3b6b2e057beb3fc64 (patch) | |
| tree | 74e8d476b2c51480420e2ef7c9bbae249b6edbc9 /drivers/net/wireless/b43/b43.h | |
| parent | 0b4419162aa6c4204843f3a13b48d9ab821d3167 (diff) | |
| parent | 65c3e4715b1b934f8dcc002d9f46b4371ca7a9b1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/rt2x00/Kconfig
drivers/net/wireless/rt2x00/rt2x00usb.c
net/sctp/protocol.c
Diffstat (limited to 'drivers/net/wireless/b43/b43.h')
| -rw-r--r-- | drivers/net/wireless/b43/b43.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/b43/b43.h b/drivers/net/wireless/b43/b43.h index 239e71c3d1b1..532365f5ecef 100644 --- a/drivers/net/wireless/b43/b43.h +++ b/drivers/net/wireless/b43/b43.h | |||
| @@ -649,7 +649,6 @@ struct b43_pio { | |||
| 649 | 649 | ||
| 650 | /* Context information for a noise calculation (Link Quality). */ | 650 | /* Context information for a noise calculation (Link Quality). */ |
| 651 | struct b43_noise_calculation { | 651 | struct b43_noise_calculation { |
| 652 | u8 channel_at_start; | ||
| 653 | bool calculation_running; | 652 | bool calculation_running; |
| 654 | u8 nr_samples; | 653 | u8 nr_samples; |
| 655 | s8 samples[8][4]; | 654 | s8 samples[8][4]; |