USB: remove the S3C24X0_merge #define, which was introduced while