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 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
armada-xp-lenovo-ix4-300d.dts
diff --git
a/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
b/arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
index def62e9e835b737b41f54da350d46fd03e423391..bbbb38888bb89db8ef5b1814873b7285341e7590 100644
(file)
--- a/
arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
+++ b/
arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts
@@
-83,9
+83,9
@@
nand@d0000 {
status = "okay";
+ label = "pxa3xx_nand-0";
num-cs = <1>;
marvell,nand-keep-config;
- marvell,nand-enable-arbiter;
nand-on-flash-bbt;
partitions {