summaryrefslogtreecommitdiffstats
path: root/sound/usb/card.c
diff options
context:
space:
mode:
authorRandy Dunlap2010-03-22 16:55:35 +0100
committerTakashi Iwai2010-03-22 17:07:36 +0100
commit6407d474e6ae6a798fa5ba40b32f508a52de80ff (patch)
tree30e0ef362cc3cd8d7e281a768c594636fd019377 /sound/usb/card.c
parentMerge branch 'topic/misc' into topic/usb (diff)
downloadkernel-qcow2-linux-6407d474e6ae6a798fa5ba40b32f508a52de80ff.tar.gz
kernel-qcow2-linux-6407d474e6ae6a798fa5ba40b32f508a52de80ff.tar.xz
kernel-qcow2-linux-6407d474e6ae6a798fa5ba40b32f508a52de80ff.zip
ALSA: usb: fix usb build error when PM is not enabled
Fix build errors when CONFIG_PM is not enabled: sound/usb/card.c:629: error: 'usb_audio_suspend' undeclared here (not in a function) sound/usb/card.c:630: error: 'usb_audio_resume' undeclared here (not in a function) Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/card.c')
-rw-r--r--sound/usb/card.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/usb/card.c b/sound/usb/card.c
index 0bd62a1aa4f2..da1346bd4856 100644
--- a/sound/usb/card.c
+++ b/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 [] = {