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 'kvm-ppc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus...
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
misc
/
atmel-ssc.txt
diff --git
a/Documentation/devicetree/bindings/misc/atmel-ssc.txt
b/Documentation/devicetree/bindings/misc/atmel-ssc.txt
index f8629bb7394578d8f1ae22123ee0da0179137270..f9fb412642fe09937adeeafd620859af858c0952 100644
(file)
--- a/
Documentation/devicetree/bindings/misc/atmel-ssc.txt
+++ b/
Documentation/devicetree/bindings/misc/atmel-ssc.txt
@@
-47,5
+47,4
@@
ssc0: ssc@f0010000 {
dma-names = "tx", "rx";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
- status = "disabled";
};