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 'pm-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
omap3-cm-t3730.dts
diff --git
a/arch/arm/boot/dts/omap3-cm-t3730.dts
b/arch/arm/boot/dts/omap3-cm-t3730.dts
index 6e944dfa0f3d13056e63bc75524b54d528c56379..683819bf09159f86b39e65955ae5c86dc05a48c8 100644
(file)
--- a/
arch/arm/boot/dts/omap3-cm-t3730.dts
+++ b/
arch/arm/boot/dts/omap3-cm-t3730.dts
@@
-9,7
+9,7
@@
/ {
model = "CompuLab CM-T3730";
- compatible = "compulab,omap3-cm-t3730", "ti,omap36xx", "ti,omap3";
+ compatible = "compulab,omap3-cm-t3730", "ti,omap36
30", "ti,omap36
xx", "ti,omap3";
wl12xx_vmmc2: wl12xx_vmmc2 {
compatible = "regulator-fixed";