diff options
| author | David S. Miller <davem@davemloft.net> | 2008-06-10 04:54:31 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-06-10 04:54:31 -0400 |
| commit | 788c0a53164c05c5ccdb1472474372b72ba74644 (patch) | |
| tree | 5f274102e3dc4bcca6cb3a695aa2c8228ad5fc4f /drivers/net/wireless/p54/p54common.h | |
| parent | e64bda89b8fe81cce9b4a20885d2c204c2d52532 (diff) | |
| parent | 78cf07472f0ede8394bacc4bc02354505080cfe1 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Conflicts:
drivers/net/ps3_gelic_wireless.c
drivers/net/wireless/libertas/main.c
Diffstat (limited to 'drivers/net/wireless/p54/p54common.h')
| -rw-r--r-- | drivers/net/wireless/p54/p54common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wireless/p54/p54common.h b/drivers/net/wireless/p54/p54common.h index c15b56e1d75e..2245fcce92dc 100644 --- a/drivers/net/wireless/p54/p54common.h +++ b/drivers/net/wireless/p54/p54common.h | |||
| @@ -152,7 +152,6 @@ struct pda_pa_curve_data { | |||
| 152 | struct memrecord { | 152 | struct memrecord { |
| 153 | u32 start_addr; | 153 | u32 start_addr; |
| 154 | u32 end_addr; | 154 | u32 end_addr; |
| 155 | struct ieee80211_tx_control *control; | ||
| 156 | }; | 155 | }; |
| 157 | 156 | ||
| 158 | struct p54_eeprom_lm86 { | 157 | struct p54_eeprom_lm86 { |