diff options
| author | Olof Johansson <olof@lixom.net> | 2013-06-25 21:08:26 +0400 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-06-25 21:08:26 +0400 |
| commit | a6f9061408950a7e024a6403aff3f90bae6bc5f3 (patch) | |
| tree | 7a9c2a97d3727ed48e215b3cf58e773f72cdece5 /arch/arm/boot | |
| parent | ab1824636dac89b48f75dba57650d24a4e38b48c (diff) | |
| parent | cdd8e498c92abd63878a5c1380217fb870ab1872 (diff) | |
| download | linux-a6f9061408950a7e024a6403aff3f90bae6bc5f3.tar.xz | |
Merge tag 'fixes-non-3.11-2' of git://git.infradead.org/users/jcooper/linux into next/fixes-non-critical
From Jason Cooper:
- mv78260: catch missing fix for mvneta register length
* tag 'fixes-non-3.11-2' of git://git.infradead.org/users/jcooper/linux:
ARM: mvebu: fix length of ethernet registers in mv78260 dtsi
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/armada-xp-mv78260.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi index f4029f015aff..2d9335da210c 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi @@ -92,7 +92,7 @@ ethernet@34000 { compatible = "marvell,armada-370-neta"; - reg = <0x34000 0x2500>; + reg = <0x34000 0x4000>; interrupts = <14>; clocks = <&gateclk 1>; status = "disabled"; |