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 'pm-cpufreq'
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
omap3-n950.dts
diff --git
a/arch/arm/boot/dts/omap3-n950.dts
b/arch/arm/boot/dts/omap3-n950.dts
index 9886bf8b90ab01bb4f5457428149e18d77c767e1..31d47a1fad847392f279d086be62769068866b99 100644
(file)
--- a/
arch/arm/boot/dts/omap3-n950.dts
+++ b/
arch/arm/boot/dts/omap3-n950.dts
@@
-12,7
+12,7
@@
/ {
model = "Nokia N950";
- compatible = "nokia,omap3-n950", "ti,omap36xx", "ti,omap3";
+ compatible = "nokia,omap3-n950", "ti,omap36
30", "ti,omap36
xx", "ti,omap3";
keys {
compatible = "gpio-keys";