summaryrefslogtreecommitdiffstats
path: root/Documentation/sound/alsa/soc/dapm.txt
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 12:25:57 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-27 12:25:57 -0300
commit50cb993ea6cd187bfed085cb3e0747066edeb02f (patch)
tree61edac62c6c5bc07c59e4369c50c6821ad77f2c0 /Documentation/sound/alsa/soc/dapm.txt
parent445c2714cf72817ab1ad3ca894c6d9b2047b3a3e (diff)
parent8be1a6d6c77ab4532e4476fdb8177030ef48b52c (diff)
downloadlinux-50cb993ea6cd187bfed085cb3e0747066edeb02f.tar.gz
linux-50cb993ea6cd187bfed085cb3e0747066edeb02f.tar.bz2
linux-50cb993ea6cd187bfed085cb3e0747066edeb02f.zip
Merge ../linux-2.6
Diffstat (limited to 'Documentation/sound/alsa/soc/dapm.txt')
-rw-r--r--Documentation/sound/alsa/soc/dapm.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/sound/alsa/soc/dapm.txt b/Documentation/sound/alsa/soc/dapm.txt
index c784a18b94dc..b2ed6983f40d 100644
--- a/Documentation/sound/alsa/soc/dapm.txt
+++ b/Documentation/sound/alsa/soc/dapm.txt
@@ -68,7 +68,7 @@ Audio DAPM widgets fall into a number of types:-
(Widgets are defined in include/sound/soc-dapm.h)
Widgets are usually added in the codec driver and the machine driver. There are
-convience macros defined in soc-dapm.h that can be used to quickly build a
+convenience macros defined in soc-dapm.h that can be used to quickly build a
list of widgets of the codecs and machines DAPM widgets.
Most widgets have a name, register, shift and invert. Some widgets have extra