diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 10:16:42 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-05 10:16:42 -0700 |
| commit | 50f7ad2500b27ce5c42be3a6936f143b158f7bc3 (patch) | |
| tree | e4833dd274f60d75df0f22bb1ae4ae84d630543c /sound/drivers/pcsp | |
| parent | 82af7aca56c67061420d618cc5a30f0fd4106b80 (diff) | |
| parent | 2c36eecfb6471c457994647771d1405502ad5fde (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
[ALSA] soc - fix S3C2410 i2s programming error
[ALSA] soc - fix s3c2410 PCM breakage
[ALSA] ac97 - Add a workaround for broken quirk for VT1617A codec
[ALSA] Revert migration to alc_set_pin_output() in alc861_auto_set_output_and_unmute()
[ALSA] fm801 - Fix kconfig dependency mess of fm801-tea575x
[ALSA] hda - Support IDT 92HD206 codec
[ALSA] pcsp: Fix build with CONFIG_PM=n
Diffstat (limited to 'sound/drivers/pcsp')
| -rw-r--r-- | sound/drivers/pcsp/pcsp.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/drivers/pcsp/pcsp.c b/sound/drivers/pcsp/pcsp.c index 59203511e77..54a1f9036c6 100644 --- a/sound/drivers/pcsp/pcsp.c +++ b/sound/drivers/pcsp/pcsp.c @@ -194,6 +194,7 @@ static void pcsp_stop_beep(struct snd_pcsp *chip) spin_unlock_irq(&chip->substream_lock); } +#ifdef CONFIG_PM static int pcsp_suspend(struct platform_device *dev, pm_message_t state) { struct snd_pcsp *chip = platform_get_drvdata(dev); @@ -201,6 +202,9 @@ static int pcsp_suspend(struct platform_device *dev, pm_message_t state) snd_pcm_suspend_all(chip->pcm); return 0; } +#else +#define pcsp_suspend NULL +#endif /* CONFIG_PM */ static void pcsp_shutdown(struct platform_device *dev) { |