summaryrefslogtreecommitdiffstats
path: root/sound/usb
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2007-12-24 14:40:56 +0100
committerJaroslav Kysela <perex@perex.cz>2008-01-31 17:29:44 +0100
commit93521d274b7fb4e6da5772768683e4984783d9e7 (patch)
tree582862de2e056d4980eee6f325c1c024bee85a45 /sound/usb
parent7db756f2b1aab15b2d4834ebb373bb5dc07d95dc (diff)
downloadop-kernel-dev-93521d274b7fb4e6da5772768683e4984783d9e7.zip
op-kernel-dev-93521d274b7fb4e6da5772768683e4984783d9e7.tar.gz
[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 c52461d..c6d628a 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)
{
OpenPOWER on IntegriCloud