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/libertas/README | |
| 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/libertas/README')
| -rw-r--r-- | drivers/net/wireless/libertas/README | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/libertas/README b/drivers/net/wireless/libertas/README index 60fd1afe89ac..1453eec82a99 100644 --- a/drivers/net/wireless/libertas/README +++ b/drivers/net/wireless/libertas/README | |||
| @@ -70,7 +70,7 @@ rdrf | |||
| 70 | These commands are used to read the MAC, BBP and RF registers from the | 70 | These commands are used to read the MAC, BBP and RF registers from the |
| 71 | card. These commands take one parameter that specifies the offset | 71 | card. These commands take one parameter that specifies the offset |
| 72 | location that is to be read. This parameter must be specified in | 72 | location that is to be read. This parameter must be specified in |
| 73 | hexadecimal (its possible to preceed preceding the number with a "0x"). | 73 | hexadecimal (its possible to precede preceding the number with a "0x"). |
| 74 | 74 | ||
| 75 | Path: /sys/kernel/debug/libertas_wireless/ethX/registers/ | 75 | Path: /sys/kernel/debug/libertas_wireless/ethX/registers/ |
| 76 | 76 | ||
| @@ -84,7 +84,7 @@ wrrf | |||
| 84 | These commands are used to write the MAC, BBP and RF registers in the | 84 | These commands are used to write the MAC, BBP and RF registers in the |
| 85 | card. These commands take two parameters that specify the offset | 85 | card. These commands take two parameters that specify the offset |
| 86 | location and the value that is to be written. This parameters must | 86 | location and the value that is to be written. This parameters must |
| 87 | be specified in hexadecimal (its possible to preceed the number | 87 | be specified in hexadecimal (its possible to precede the number |
| 88 | with a "0x"). | 88 | with a "0x"). |
| 89 | 89 | ||
| 90 | Usage: | 90 | Usage: |