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' of git://git.armlinux.org.uk/~rmk/linux-arm
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
mfd
/
atmel-hlcdc.txt
diff --git
a/Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt
b/Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt
index eec40be7f79a007005a2e835c1d73e59298a02bc..3f643ef121ff51ade6dd0205d5d3ec770cebf6f9 100644
(file)
--- a/
Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt
+++ b/
Documentation/devicetree/bindings/mfd/atmel-hlcdc.txt
@@
-25,7
+25,6
@@
Example:
clocks = <&lcdc_clk>, <&lcdck>, <&clk32k>;
clock-names = "periph_clk","sys_clk", "slow_clk";
interrupts = <36 IRQ_TYPE_LEVEL_HIGH 0>;
- status = "disabled";
hlcdc-display-controller {
compatible = "atmel,hlcdc-display-controller";