aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/at91sam9x25ek.dts
diff options
context:
space:
mode:
authorMark Brown <broonie@sirena.org.uk>2013-06-14 12:08:35 +0100
committerMark Brown <broonie@sirena.org.uk>2013-06-14 12:08:35 +0100
commit017db6aba01656f754d034bf17c6fae0a76ca36e (patch)
treea3cf0fd4d94aaaa6d56013da1386bd71ca929e52 /arch/arm/boot/dts/at91sam9x25ek.dts
parent964318b02e12781615db595075a29557f4302940 (diff)
parent4b73febd1ba302268aabe370de25601eaa884b25 (diff)
Merge branch 'tracking-linux-3.x.y' into merge-manifest
Diffstat (limited to 'arch/arm/boot/dts/at91sam9x25ek.dts')
-rw-r--r--arch/arm/boot/dts/at91sam9x25ek.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9x25ek.dts b/arch/arm/boot/dts/at91sam9x25ek.dts
index af907eaa1f2..80015b0d4c1 100644
--- a/arch/arm/boot/dts/at91sam9x25ek.dts
+++ b/arch/arm/boot/dts/at91sam9x25ek.dts
@@ -11,6 +11,6 @@
/include/ "at91sam9x5ek.dtsi"
/ {
- model = "Atmel AT91SAM9G25-EK";
+ model = "Atmel AT91SAM9X25-EK";
compatible = "atmel,at91sam9x25ek", "atmel,at91sam9x5ek", "atmel,at91sam9x5", "atmel,at91sam9";
};