diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:34:31 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-21 23:34:31 +0200 |
| commit | 088eb2a84b3b093af60bbe0b65151e8a9cd2d57d (patch) | |
| tree | 8f145d8c71f6e249d6664b5482ac216b8c6e4016 /arch/arm/boot/dts/mmp2-brownstone.dts | |
| parent | 6217a69a1e38807b3046b4fd6e4bf413e0e03b67 (diff) | |
| parent | 84a1caf1453c3d44050bd22db958af4a7f99315c (diff) | |
| download | talos-op-linux-088eb2a84b3b093af60bbe0b65151e8a9cd2d57d.tar.gz talos-op-linux-088eb2a84b3b093af60bbe0b65151e8a9cd2d57d.zip | |
Merge tag 'v3.5-rc7' into late/soc
Linux 3.5-rc7
Diffstat (limited to 'arch/arm/boot/dts/mmp2-brownstone.dts')
| -rw-r--r-- | arch/arm/boot/dts/mmp2-brownstone.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/mmp2-brownstone.dts b/arch/arm/boot/dts/mmp2-brownstone.dts index 153a4b2d12b5..c9b4f27d191e 100644 --- a/arch/arm/boot/dts/mmp2-brownstone.dts +++ b/arch/arm/boot/dts/mmp2-brownstone.dts @@ -11,7 +11,7 @@ /include/ "mmp2.dtsi" / { - model = "Marvell MMP2 Aspenite Development Board"; + model = "Marvell MMP2 Brownstone Development Board"; compatible = "mrvl,mmp2-brownstone", "mrvl,mmp2"; chosen { @@ -19,7 +19,7 @@ }; memory { - reg = <0x00000000 0x04000000>; + reg = <0x00000000 0x08000000>; }; soc { |
