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.kernel.org/pub/scm/linux/kernel/git/mszeredi...
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
net
/
can
/
m_can.txt
diff --git
a/Documentation/devicetree/bindings/net/can/m_can.txt
b/Documentation/devicetree/bindings/net/can/m_can.txt
index 9e331777c2036ae6e2a9c685add8f32633aa77e7..78138333ff7a3611f8671a4372e08a0da55eddbc 100644
(file)
--- a/
Documentation/devicetree/bindings/net/can/m_can.txt
+++ b/
Documentation/devicetree/bindings/net/can/m_can.txt
@@
-56,7
+56,6
@@
m_can1: can@020e8000 {
<&clks IMX6SX_CLK_CANFD>;
clock-names = "hclk", "cclk";
bosch,mram-cfg = <0x0 0 0 32 0 0 0 1>;
- status = "disabled";
};
Board dts: