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 'for-linus' of git://linux-c6x.org/git/projects/linux-c6x-upstreaming
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
bcm5301x-nand-cs0.dtsi
diff --git
a/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
b/arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
index e5a2d62daf9267c990c9a79bc9ae466568f1bd9a..925a7c9ce5b7f42bdd21525b566bd3bc5c7aa240 100644
(file)
--- a/
arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
+++ b/
arch/arm/boot/dts/bcm5301x-nand-cs0.dtsi
@@
-12,6
+12,10
@@
reg = <0>;
#address-cells = <1>;
#size-cells = <1>;
+
+ partitions {
+ compatible = "brcm,bcm947xx-cfe-partitions";
+ };
};
};
};