mirror of
https://github.com/MiSTer-devel/u-boot_MiSTer.git
synced 2026-04-26 03:05:54 +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>