From f0815a93511cc46d8d422f68049496e88f85acf2 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Wed, 23 Sep 2009 15:57:43 -0700
Subject: [PATCH] --- yaml --- r: 165721 b: refs/heads/master c:
 cd6045138ed1bb5d8773e940d51c34318eef3ef2 h: refs/heads/master i:   165719:
 a5513288ac0c235dbb8423daf6f663cbb960df0f v: v3

---
 [refs]                            | 2 +-
 trunk/drivers/usb/serial/sierra.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 08870cab4337..6461e574d4cc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d68721eb339e9237c11c1fea5f73f86211d14918
+refs/heads/master: cd6045138ed1bb5d8773e940d51c34318eef3ef2
diff --git a/trunk/drivers/usb/serial/sierra.c b/trunk/drivers/usb/serial/sierra.c
index 68fa0e43b781..8c075b2416bb 100644
--- a/trunk/drivers/usb/serial/sierra.c
+++ b/trunk/drivers/usb/serial/sierra.c
@@ -912,6 +912,7 @@ static void sierra_release(struct usb_serial *serial)
 	}
 }
 
+#ifdef CONFIG_PM
 static void stop_read_write_urbs(struct usb_serial *serial)
 {
 	int i, j;
@@ -988,6 +989,10 @@ static int sierra_resume(struct usb_serial *serial)
 
 	return ec ? -EIO : 0;
 }
+#else
+#define sierra_suspend NULL
+#define sierra_resume NULL
+#endif
 
 static struct usb_serial_driver sierra_device = {
 	.driver = {