From ad4792022323642133728b28000575545643346c Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Mon, 24 Dec 2007 14:40:56 +0100
Subject: [PATCH] --- yaml --- r: 81580 b: refs/heads/master c:
 93521d274b7fb4e6da5772768683e4984783d9e7 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/sound/usb/usbaudio.c | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4225f38f7ef5..9998784a245c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7db756f2b1aab15b2d4834ebb373bb5dc07d95dc
+refs/heads/master: 93521d274b7fb4e6da5772768683e4984783d9e7
diff --git a/trunk/sound/usb/usbaudio.c b/trunk/sound/usb/usbaudio.c
index c52461d4a042..c6d628a3127c 100644
--- a/trunk/sound/usb/usbaudio.c
+++ b/trunk/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)
 {