mirror of
https://github.com/torvalds/linux.git
synced 2024-11-10 22:21:40 +00:00
mvebu fixes for 4.6 (part 1)
- fix USB adress register for Linksys Armada 388 based boards - fix build warning in mvebu-mbus -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAlcGmgAACgkQCwYYjhRyO9WmLACgkLHkRxw3Xmp5/g3tSgBzh06A Qb4An2adegesOnsQzbVwWeaCaJxdEbk/ =sMxU -----END PGP SIGNATURE----- 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>
This commit is contained in:
commit
0b24f7a8d6
@ -117,7 +117,7 @@
|
||||
};
|
||||
|
||||
/* USB part of the eSATA/USB 2.0 port */
|
||||
usb@50000 {
|
||||
usb@58000 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
|
@ -972,7 +972,7 @@ int mvebu_mbus_get_dram_win_info(phys_addr_t phyaddr, u8 *target, u8 *attr)
|
||||
}
|
||||
}
|
||||
|
||||
pr_err("invalid dram address 0x%x\n", phyaddr);
|
||||
pr_err("invalid dram address %pa\n", &phyaddr);
|
||||
return -EINVAL;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(mvebu_mbus_get_dram_win_info);
|
||||
|
Loading…
Reference in New Issue
Block a user