Fixed merge errors in omap2430 musb.

Signed-off-by: David Rodero <david@codiguiel.net>