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 tag 'devicetree-for-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
display
/
sunxi
/
sun4i-drm.txt
diff --git
a/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
b/Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
index 2ee6ff0ef98e7dcf6d16e977fa8dd852b10a247c..92441086cabad07cb9bfe44095cfbd605ef03e38 100644
(file)
--- a/
Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
+++ b/
Documentation/devicetree/bindings/display/sunxi/sun4i-drm.txt
@@
-278,7
+278,6
@@
hdmi: hdmi@01c16000 {
<&dma SUN4I_DMA_NORMAL 16>,
<&dma SUN4I_DMA_DEDICATED 24>;
dma-names = "ddc-tx", "ddc-rx", "audio-tx";
- status = "disabled";
ports {
#address-cells = <1>;