diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-12-10 18:59:21 +0100 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-12-10 18:59:21 +0100 |
| commit | 8e1c9f59442dd4fc80914c224dfd032ca2c284d2 (patch) | |
| tree | 69f03f96ca80c34ff251225e13390de5cbf71b24 /arch/arm/boot/dts/armada-370-xp.dtsi | |
| parent | Merge tag 'mvebu-dt-3.14-2' of git://git.infradead.org/linux-mvebu into next/dt (diff) | |
| parent | Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/c... (diff) | |
| download | linux-8e1c9f59442dd4fc80914c224dfd032ca2c284d2.tar.xz linux-8e1c9f59442dd4fc80914c224dfd032ca2c284d2.zip | |
Merge branch 'next/cleanup' into next/dt
Diffstat (limited to 'arch/arm/boot/dts/armada-370-xp.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/armada-370-xp.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index f2b6ae4f55d0..45839e53538e 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi @@ -118,7 +118,7 @@ coherency-fabric@20200 { compatible = "marvell,coherency-fabric"; - reg = <0x20200 0xb0>, <0x21810 0x1c>; + reg = <0x20200 0xb0>, <0x21010 0x1c>; }; serial@12000 { |