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-4.14' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux
[sfrench/cifs-2.6.git]
/
Documentation
/
devicetree
/
bindings
/
mtd
/
sunxi-nand.txt
diff --git
a/Documentation/devicetree/bindings/mtd/sunxi-nand.txt
b/Documentation/devicetree/bindings/mtd/sunxi-nand.txt
index f322f56aef74eab778244c6ccaa5a5d4a4463e32..a37c67bcb43b6b8e35ce8215e734bd016e41199a 100644
(file)
--- a/
Documentation/devicetree/bindings/mtd/sunxi-nand.txt
+++ b/
Documentation/devicetree/bindings/mtd/sunxi-nand.txt
@@
-41,7
+41,6
@@
nfc: nand@01c03000 {
#size-cells = <0>;
pinctrl-names = "default";
pinctrl-0 = <&nand_pins_a &nand_cs0_pins_a &nand_rb0_pins_a>;
- status = "okay";
nand@0 {
reg = <0>;