Fix merge error in omap-mcbsp