From f84fd7c724e65dcc1bb64d0e81ac26f741b47b1f Mon Sep 17 00:00:00 2001
From: Randy Dunlap <randy.dunlap@oracle.com>
Date: Mon, 22 Mar 2010 08:55:35 -0700
Subject: [PATCH] --- yaml --- r: 193227 b: refs/heads/master c:
 6407d474e6ae6a798fa5ba40b32f508a52de80ff h: refs/heads/master i:   193225:
 cdcf119c01c5e9438dbc8b9a7b98f813aeeb336d   193223:
 8941c81372d2586dcc84a9497ffdbc8a6bab37a1 v: v3

---
 [refs]                 | 2 +-
 trunk/sound/usb/card.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 84389f1c2b94..a2d2f0cdb226 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fb20b61550d3c5335e59819ed22734900d4d6e3
+refs/heads/master: 6407d474e6ae6a798fa5ba40b32f508a52de80ff
diff --git a/trunk/sound/usb/card.c b/trunk/sound/usb/card.c
index 0bd62a1aa4f2..da1346bd4856 100644
--- a/trunk/sound/usb/card.c
+++ b/trunk/sound/usb/card.c
@@ -606,6 +606,9 @@ static int usb_audio_resume(struct usb_interface *intf)
 
 	return 0;
 }
+#else
+#define usb_audio_suspend	NULL
+#define usb_audio_resume	NULL
 #endif		/* CONFIG_PM */
 
 static struct usb_device_id usb_audio_ids [] = {