max77693_haptic: fixing merge errors
and removing ifdefs