diff options
author | Mark Brown <broonie@kernel.org> | 2015-08-06 11:34:41 (GMT) |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-08-06 11:34:41 (GMT) |
commit | 113adf21cf1ed49b57098c1d0d6b38ffbe9ea1e6 (patch) | |
tree | 90505c4418561b98f773e5f7b549399e2868c239 /include/uapi/sound | |
parent | c3879956957b8de9fd6cbad604e668fd00c6506c (diff) | |
parent | 996034b117b467709dec7811ef134063934fa626 (diff) | |
download | linux-113adf21cf1ed49b57098c1d0d6b38ffbe9ea1e6.tar.xz |
Merge tag 'asoc-fix-v4.2-rc3' into asoc-fix-topology
ASoC: Fixes for v4.2
A lot of small fixes here, a few to the core:
- Fix for binding DAPM stream widgets on devices with prefixes assigned
to them
- Minor fixes for the newly added topology interfaces
- Locking and memory leak fixes for DAPM
- Driver specific fixes
Diffstat (limited to 'include/uapi/sound')
-rw-r--r-- | include/uapi/sound/asoc.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/uapi/sound/asoc.h b/include/uapi/sound/asoc.h index d550c8d..2819fc1 100644 --- a/include/uapi/sound/asoc.h +++ b/include/uapi/sound/asoc.h @@ -110,7 +110,7 @@ /* * Block Header. - * This header preceeds all object and object arrays below. + * This header precedes all object and object arrays below. */ struct snd_soc_tplg_hdr { __le32 magic; /* magic number */ @@ -222,7 +222,7 @@ struct snd_soc_tplg_stream_config { /* * Manifest. List totals for each payload type. Not used in parsing, but will * be passed to the component driver before any other objects in order for any - * global componnent resource allocations. + * global component resource allocations. * * File block representation for manifest :- * +-----------------------------------+----+ |