diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-08-23 14:12:22 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-08-23 14:12:22 +0200 |
| commit | 68538bf2bce557c3b5fe8c59b034d45352500db1 (patch) | |
| tree | a84b68990cadcbfc277acc7b7f2b75716750e203 /sound/oss | |
| parent | alsa/rme96: Add missing inclusion of linux/vmalloc.h (diff) | |
| parent | Merge remote-tracking branch 'asoc/topic/wm8994' into asoc-next (diff) | |
| download | linux-68538bf2bce557c3b5fe8c59b034d45352500db1.tar.xz linux-68538bf2bce557c3b5fe8c59b034d45352500db1.zip | |
Merge tag 'asoc-v3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.12
- DAPM is now mandatory for CODEC drivers in order to avoid the repeated
regressions in the special cases for non-DAPM CODECs and make it
easier to integrate with other components on boards. All existing
drivers have had some level of DAPM support added.
- A lot of cleanups in DAPM plus support for maintaining controls in a
specific state while a DAPM widget all contributed by Lars-Peter Clausen.
- Core helpers for bitbanged AC'97 reset from Markus Pargmann.
- New drivers and support for Analog Devices ADAU1702 and ADAU1401(a),
Asahi Kasei Microdevices AK4554, Atmel AT91ASM9x5 and WM8904 based
machines, Freescale S/PDIF and SSI AC'97, Renesas R-Car SoCs, Samsung
Exynos5420 SoCs, Texas Instruments PCM1681 and PCM1792A and Wolfson
Microelectronics WM8997.
- Support for building drivers that can support it cross-platform for
compile test.
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/vwsnd.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c index 7e814a5c3677..4bbcc0fcd4eb 100644 --- a/sound/oss/vwsnd.c +++ b/sound/oss/vwsnd.c @@ -149,17 +149,19 @@ #include <linux/interrupt.h> #include <linux/mutex.h> #include <linux/slab.h> +#include <linux/delay.h> #include <asm/visws/cobalt.h> #include "sound_config.h" +static DEFINE_MUTEX(vwsnd_mutex); + /*****************************************************************************/ /* debug stuff */ #ifdef VWSND_DEBUG -static DEFINE_MUTEX(vwsnd_mutex); static int shut_up = 1; /* |