]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[ALSA] sound/usb/usbaudio.c: fix build with CONFIG_PM=n
authorAndrew Morton <akpm@linux-foundation.org>
Mon, 24 Dec 2007 13:40:56 +0000 (14:40 +0100)
committerJaroslav Kysela <perex@perex.cz>
Thu, 31 Jan 2008 16:29:44 +0000 (17:29 +0100)
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>
sound/usb/usbaudio.c

index c52461d4a0424d3e69fd70e23decd2c3f5bc5829..c6d628a3127c25cf6ae9f018bd48512db2f2f72f 100644 (file)
@@ -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)
 {