removed unused CONFIG_AUDIO_NONSHORT