Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=93521d274b7fb4e6da5772768683e4984783d9e7
Commit: 93521d274b7fb4e6da5772768683e4984783d9e7
Parent: 7db756f2b1aab15b2d4834ebb373bb5dc07d95dc
Author: Andrew Morton <[EMAIL PROTECTED]>
AuthorDate: Mon Dec 24 14:40:56 2007 +0100
Committer: Jaroslav Kysela <[EMAIL PROTECTED]>
CommitDate: Thu Jan 31 17:29:44 2008 +0100
[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 <[EMAIL PROTECTED]>
Signed-off-by: Takashi Iwai <[EMAIL PROTECTED]>
Signed-off-by: Jaroslav Kysela <[EMAIL PROTECTED]>
---
sound/usb/usbaudio.c | 8 ++++++++
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)
{
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
