diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /drivers/net/wireless/rayctl.h | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'drivers/net/wireless/rayctl.h')
| -rw-r--r-- | drivers/net/wireless/rayctl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/rayctl.h b/drivers/net/wireless/rayctl.h index 49d9b267bc0f..d7646f299bd3 100644 --- a/drivers/net/wireless/rayctl.h +++ b/drivers/net/wireless/rayctl.h | |||
| @@ -578,7 +578,7 @@ struct tx_msg { | |||
| 578 | UCHAR var[1]; | 578 | UCHAR var[1]; |
| 579 | }; | 579 | }; |
| 580 | 580 | ||
| 581 | /****** ECF Receive Control Stucture (RCS) Area at Shared RAM offset 0x0800 */ | 581 | /****** ECF Receive Control Structure (RCS) Area at Shared RAM offset 0x0800 */ |
| 582 | /* Structures for command specific parameters (rcs.var) */ | 582 | /* Structures for command specific parameters (rcs.var) */ |
| 583 | struct rx_packet_cmd { | 583 | struct rx_packet_cmd { |
| 584 | UCHAR rx_data_ptr[2]; | 584 | UCHAR rx_data_ptr[2]; |