e20cc2ca15
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> |
||
---|---|---|
.. | ||
eth | ||
gadget | ||
host | ||
musb | ||
musb-new | ||
phy | ||
ulpi |