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 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
lpc4357-ea4357-devkit.dts
diff --git
a/arch/arm/boot/dts/lpc4357-ea4357-devkit.dts
b/arch/arm/boot/dts/lpc4357-ea4357-devkit.dts
index 9b5fad622522090d12f6d2ddae93caf3f000a2d3..02b23fa29d75973f8bd153eb60350f68bf96c0cc 100644
(file)
--- a/
arch/arm/boot/dts/lpc4357-ea4357-devkit.dts
+++ b/
arch/arm/boot/dts/lpc4357-ea4357-devkit.dts
@@
-490,7
+490,7
@@
};
eeprom@57 {
- compatible = "microchip,24c64";
+ compatible = "microchip,24c64"
, "atmel,24c64"
;
reg = <0x57>;
};
};