aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-12-24 08:40:56 -0500
committerJaroslav Kysela <perex@perex.cz>2008-01-31 11:29:44 -0500
commit93521d274b7fb4e6da5772768683e4984783d9e7 (patch)
tree582862de2e056d4980eee6f325c1c024bee85a45 /sound/usb
parent7db756f2b1aab15b2d4834ebb373bb5dc07d95dc (diff)
[ALSA] sound/usb/usbaudio.c: fix build with CONFIG_PM=n
sound/usb/usbaudio.c: In function 'usb_audio_suspend': sound/usb/usbaudio.c:3674: error: implicit declaration of function 'snd_pcm_sus\pend_all' Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound/usb')
-rw-r--r--sound/usb/usbaudio.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index c52461d4a042..c6d628a3127c 100644
--- a/sound/usb/usbaudio.c
+++ b/sound/usb/usbaudio.c
@@ -2077,8 +2077,14 @@ int snd_usb_ctl_msg(struct usb_device *dev, unsigned int pipe, __u8 request,
2077static int usb_audio_probe(struct usb_interface *intf, 2077static int usb_audio_probe(struct usb_interface *intf,
2078 const struct usb_device_id *id); 2078 const struct usb_device_id *id);
2079static void usb_audio_disconnect(struct usb_interface *intf); 2079static void usb_audio_disconnect(struct usb_interface *intf);
2080
2081#ifdef CONFIG_PM
2080static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message); 2082static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message);
2081static int usb_audio_resume(struct usb_interface *intf); 2083static int usb_audio_resume(struct usb_interface *intf);
2084#else
2085#define usb_audio_suspend NULL
2086#define usb_audio_resume NULL
2087#endif
2082 2088
2083static struct usb_device_id usb_audio_ids [] = { 2089static struct usb_device_id usb_audio_ids [] = {
2084#include "usbquirks.h" 2090#include "usbquirks.h"
@@ -3658,6 +3664,7 @@ static void usb_audio_disconnect(struct usb_interface *intf)
3658 dev_get_drvdata(&intf->dev)); 3664 dev_get_drvdata(&intf->dev));
3659} 3665}
3660 3666
3667#ifdef CONFIG_PM
3661static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message) 3668static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
3662{ 3669{
3663 struct snd_usb_audio *chip = dev_get_drvdata(&intf->dev); 3670 struct snd_usb_audio *chip = dev_get_drvdata(&intf->dev);
@@ -3695,6 +3702,7 @@ static int usb_audio_resume(struct usb_interface *intf)
3695 3702
3696 return 0; 3703 return 0;
3697} 3704}
3705#endif /* CONFIG_PM */
3698 3706
3699static int __init snd_usb_audio_init(void) 3707static int __init snd_usb_audio_init(void)
3700{ 3708{