git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus-4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
sound
/
fsl-asoc-card.txt
diff --git
a/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt
b/Documentation/devicetree/bindings/sound/fsl-asoc-card.txt
index ceaef512698967ff16677b3771d2fd8c5227aaac..f749e2744824d8273bfe22a1592fa50803b4e51d 100644
(file)
--- a/
Documentation/devicetree/bindings/sound/fsl-asoc-card.txt
+++ b/
Documentation/devicetree/bindings/sound/fsl-asoc-card.txt
@@
-58,7
+58,7
@@
Required properties:
* DMIC (stands for Digital Microphone Jack)
Note: The "Mic Jack" and "AMIC" are redundant while
- coex
si
ting in order to support the old bindings
+ coex
is
ting in order to support the old bindings
of wm8962 and sgtl5000.
Optional properties: