summaryrefslogtreecommitdiffstats
path: root/sound/oss
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 10:59:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-30 10:59:52 -0700
commit48a46752a9a43c9bd106cc9798ee511feef5b7e6 (patch)
treece6c93ff9197bfa8cc3b65f57e6e5fa69afe61fe /sound/oss
parent59f2fe326666002f8387fb434a871815d3535f40 (diff)
parentc578ae0026da81a589245ee08e0fd1b1d8a55f4e (diff)
downloadlinux-48a46752a9a43c9bd106cc9798ee511feef5b7e6.tar.bz2
Merge tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai: "A collection of small fixes for 3.4-rc1, including - mic-recording regression fix for Realtek codec - clean-up of dmaengine parameter mess - WM8894 calibration tweak - minor fixes for asihpi and some bool module parms" * tag 'sound-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: ALSA: fix isa/opti9xx module param type sound: fix oss/msnd_pinnacle module param type ALSA: asihpi - fix return type of hpios_locked_mem_alloc() ASoC: dmaengine_pcm: use dmaengine cyclic wrapper ASoC: Add extra parameter to device_prep_dma_cyclic ALSA: hda/realtek - Fix ADC assignment with a shared HP/Mic pin ASoC: wm8994: Update WM8994 DCS calibration
Diffstat (limited to 'sound/oss')
-rw-r--r--sound/oss/msnd_pinnacle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/msnd_pinnacle.c b/sound/oss/msnd_pinnacle.c
index eba734560f6f..2c79d60a725f 100644
--- a/sound/oss/msnd_pinnacle.c
+++ b/sound/oss/msnd_pinnacle.c
@@ -1631,7 +1631,7 @@ static int ide_irq __initdata = 0;
static int joystick_io __initdata = 0;
/* If we have the digital daugherboard... */
-static int digital __initdata = 0;
+static bool digital __initdata = false;
#endif
static int fifosize __initdata = DEFFIFOSIZE;