mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 08:42:12 +02: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>