diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-30 17:13:32 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-30 17:13:32 -0500 |
| commit | d7f0efcb229bc1c3e458c6968efe4a6644f24740 (patch) | |
| tree | dc94c6d3d9631db433fbbcc91c25387a76402a69 /audio/mixeng.c | |
| parent | 1b365b2eb629d033b3650acc9f46fc132ef0981c (diff) | |
| parent | 19b0dfc19c0d911c322a03899806c59bc2f593c9 (diff) | |
| download | focaccia-qemu-d7f0efcb229bc1c3e458c6968efe4a6644f24740.tar.gz focaccia-qemu-d7f0efcb229bc1c3e458c6968efe4a6644f24740.zip | |
Merge remote-tracking branch 'kraxel/audio.1' into staging
# By Bandan Das (3) and Gerd Hoffmann (1) # Via Gerd Hoffmann * kraxel/audio.1: audio: remove CONFIG_MIXEMU configure option hda-codec: make mixemu selectable at runtime hda-codec: refactor common definitions into a header file audio maintainers update Message-id: 1380011943-15083-1-git-send-email-kraxel@redhat.com
Diffstat (limited to 'audio/mixeng.c')
| -rw-r--r-- | audio/mixeng.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/audio/mixeng.c b/audio/mixeng.c index 02a9d9fb92..0e4976f271 100644 --- a/audio/mixeng.c +++ b/audio/mixeng.c @@ -348,7 +348,6 @@ void mixeng_clear (struct st_sample *buf, int len) void mixeng_volume (struct st_sample *buf, int len, struct mixeng_volume *vol) { -#ifdef CONFIG_MIXEMU if (vol->mute) { mixeng_clear (buf, len); return; @@ -364,9 +363,4 @@ void mixeng_volume (struct st_sample *buf, int len, struct mixeng_volume *vol) #endif buf += 1; } -#else - (void) buf; - (void) len; - (void) vol; -#endif } |