summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2016-04-12 12:35:07 -0700
committerOlof Johansson <olof@lixom.net>2016-04-12 12:35:07 -0700
commit0b24f7a8d6e0d17bcf24433ce5827841a05b5b46 (patch)
tree17e0ad5f2cb267bb5694d4eaaea8515406414dd8 /arch
parent452a31fd36255fc7d9dd9dce9d820fe0e5bb97b8 (diff)
parent199831c77c50e6913e893b6bc268ba9f4a9a2bf8 (diff)
downloadlinux-sh-0b24f7a8d6e0d17bcf24433ce5827841a05b5b46.tar.gz
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.dtsi2
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";
};