diff options
| author |   Olof Johansson <olof@lixom.net> | 2016-04-12 12:35:07 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-04-12 12:35:07 -0700 |
| commit | 0b24f7a8d6e0d17bcf24433ce5827841a05b5b46 (patch) | |
| tree | 17e0ad5f2cb267bb5694d4eaaea8515406414dd8 /arch | |
| parent | ARM: sa1100: remove references to the defunct handhelds.org (diff) | |
| parent | ARM: mvebu: Correct unit address for linksys (diff) | |
| download | linux-dev-0b24f7a8d6e0d17bcf24433ce5827841a05b5b46.tar.xz linux-dev-0b24f7a8d6e0d17bcf24433ce5827841a05b5b46.zip | |
Merge tag 'mvebu-fixes-4.6-1' of git://git.infradead.org/linux-mvebu into fixes
mvebu fixes for 4.6 (part 1)
- fix USB adress register for Linksys Armada 388 based boards
- fix build warning in mvebu-mbus
* tag 'mvebu-fixes-4.6-1' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Correct unit address for linksys
bus: mvebu-mbus: use %pa to print phys_addr_t
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/armada-385-linksys.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/armada-385-linksys.dtsi b/arch/arm/boot/dts/armada-385-linksys.dtsi index 3710755c6d76..85d2c377c332 100644 --- a/arch/arm/boot/dts/armada-385-linksys.dtsi +++ b/arch/arm/boot/dts/armada-385-linksys.dtsi @@ -117,7 +117,7 @@ }; /* USB part of the eSATA/USB 2.0 port */ - usb@50000 { + usb@58000 { status = "okay"; }; |