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 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
omap3-overo-storm-chestnut43.dts
diff --git
a/arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts
b/arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts
index f204c8af8281841904d0fc102852a74e766a9d04..bc5a04e0333627444e0b0e1feb14847ed6ebbb0d 100644
(file)
--- a/
arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts
+++ b/
arch/arm/boot/dts/omap3-overo-storm-chestnut43.dts
@@
-14,7
+14,7
@@
/ {
model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Chestnut43";
/ {
model = "OMAP36xx/AM37xx/DM37xx Gumstix Overo on Chestnut43";
- compatible = "gumstix,omap3-overo-chestnut43", "gumstix,omap3-overo", "ti,omap36xx", "ti,omap3";
+ compatible = "gumstix,omap3-overo-chestnut43", "gumstix,omap3-overo", "ti,omap36
30", "ti,omap36
xx", "ti,omap3";
};
&omap3_pmx_core2 {
};
&omap3_pmx_core2 {