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 'tpm-fixes-for-4.2-rc2' of https://github.com/PeterHuewe/linux-tpmdd into...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
armada-xp-mv78460.dtsi
diff --git
a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
index 661d54c815802d1bb1d2e1fa31cb255d90caf12e..0e24f1a38540e30ccc257972537c8982074f4c75 100644
(file)
--- a/
arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/
arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@
-356,7
+356,7
@@
};
eth3: ethernet@34000 {
- compatible = "marvell,armada-
370
-neta";
+ compatible = "marvell,armada-
xp
-neta";
reg = <0x34000 0x4000>;
interrupts = <14>;
clocks = <&gateclk 1>;