mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-15 23:25:07 +00:00
Code Issues Releases Wiki Activity

mvebu fixes non-critical for v3.11 (round 2)

Browse source 
- mvebu
     - mv78260: catch missing fix for mvneta register length
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
 iQEcBAABAgAGBQJRx20mAAoJEAi3KVZQDZAe1lEH/0oOI0tNUTDv2v/eYAHBTemw
 nc/9aOaYTVCEmz1U2APTuHgl3+d75epnt0u5DcBmfaX/Jd3S3JEK9BmYgOVneNmL
 AYrQH29VF8lOOWQt2nRvZmgRMvgtcHVJrZbwtxSo5oPrvzPd9a64jwCg3/HeLubX
 2zIj6GZhumKJZf7nKb1OjmYjNH4V2SjzB466I1wsqjkKPRkeKSk/rs2glVssEsb4
 cWE12zABBuPKeUF/be26gOttAjzeAoTpVx3ikfq8Tn19W56C1Jn2GesSw74W1bcS
 /aFZHy/eOGU/SNkP1tPmlMP19HXzzGLtHa0BR8aYrKa75clFBSK4+AsSkwzZGSA=
 =T/gM
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Olof Johansson 2013-06-25 10:08:26 -07:00
commit a6f9061408
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/boot/dts/armada-xp-mv78260.dtsi
View file

@ -92,7 +92,7 @@ gpio2: gpio@18180 {
ethernet@34000 {
compatible = "marvell,armada-370-neta";
reg = <0x34000 0x2500>;
reg = <0x34000 0x4000>;
interrupts = <14>;
clocks = <&gateclk 1>;
status = "disabled";