diff options
| author | Olof Johansson <olof@lixom.net> | 2012-06-16 18:36:52 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-06-16 18:36:52 -0700 |
| commit | 7dea9e73614ba37914b8867dd0fef49193b22b8d (patch) | |
| tree | c2b5598c9f266ce2ee8f94795e560d2a4d28d5fe /arch/arm/boot/dts/mmp2-brownstone.dts | |
| parent | f9c15a1b7d60b69f42b2808140a4713808a3bec1 (diff) | |
| parent | 10bd21c0547ba2834374ccdddbc6a984eeed432c (diff) | |
Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
* 'fixes' of git://github.com/hzhuang1/linux:
ARM: mmp: fix missing cascade_irq in irq handler
ARM: dts: update memory size on brownstone
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 153a4b2d12b..c9b4f27d191 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 { |