mirror of
https://github.com/AsahiLinux/u-boot
synced 2025-03-02 14:27:17 +00:00
Fixup an easy conflict over adding the clk_get prototype and USB_OTG defines for am33xx having moved. Conflicts: arch/arm/include/asm/arch-am33xx/hardware.h Signed-off-by: Tom Rini <trini@ti.com> |
||
---|---|---|
.. | ||
asm |