From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 24 Dec 2007 13:40:56 +0000 (+0100)
Subject: [ALSA] sound/usb/usbaudio.c: fix build with CONFIG_PM=n
X-Git-Tag: v2.6.25-rc1~1127^2~165
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93521d274b7fb4e6da5772768683e4984783d9e7;p=linux-2.6

[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>
---

diff --git a/sound/usb/usbaudio.c b/sound/usb/usbaudio.c
index c52461d4a0..c6d628a312 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,
 static int usb_audio_probe(struct usb_interface *intf,
 			   const struct usb_device_id *id);
 static void usb_audio_disconnect(struct usb_interface *intf);
+
+#ifdef CONFIG_PM
 static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message);
 static int usb_audio_resume(struct usb_interface *intf);
+#else
+#define usb_audio_suspend NULL
+#define usb_audio_resume NULL
+#endif
 
 static struct usb_device_id usb_audio_ids [] = {
 #include "usbquirks.h"
@@ -3658,6 +3664,7 @@ static void usb_audio_disconnect(struct usb_interface *intf)
 				 dev_get_drvdata(&intf->dev));
 }
 
+#ifdef CONFIG_PM
 static int usb_audio_suspend(struct usb_interface *intf, pm_message_t message)
 {
 	struct snd_usb_audio *chip = dev_get_drvdata(&intf->dev);
@@ -3695,6 +3702,7 @@ static int usb_audio_resume(struct usb_interface *intf)
 
 	return 0;
 }
+#endif		/* CONFIG_PM */
 
 static int __init snd_usb_audio_init(void)
 {