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> |
||
|---|---|---|
| .. | ||
| da8xxevm | ||
| dm355evm | ||
| dm355leopard | ||
| dm365evm | ||
| dm6467evm | ||
| dvevm | ||
| ea20 | ||
| schmoogie | ||
| sffsdr | ||
| sonata | ||