diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2009-09-23 15:57:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-24 07:21:06 -0700 |
| commit | cd6045138ed1bb5d8773e940d51c34318eef3ef2 (patch) | |
| tree | 8b50c92193e25c2b6108c738ff925551f36601a4 /drivers | |
| parent | d68721eb339e9237c11c1fea5f73f86211d14918 (diff) | |
| download | linux-3.10-cd6045138ed1bb5d8773e940d51c34318eef3ef2.tar.gz linux-3.10-cd6045138ed1bb5d8773e940d51c34318eef3ef2.tar.bz2 linux-3.10-cd6045138ed1bb5d8773e940d51c34318eef3ef2.zip | |
drivers/usb/serial/sierra.c: fix CONFIG_PM=n build
drivers/usb/serial/sierra.c: In function 'sierra_suspend':
drivers/usb/serial/sierra.c:936: error: 'struct usb_device' has no member named 'auto_pm'
Repairs
commit e6929a9020acbeb04d9a3ad9a88234c15be808fd
Author: Oliver Neukum <oliver@neukum.org>
Date: Fri Sep 4 23:19:53 2009 +0200
USB: support for autosuspend in sierra while online
Cc: Greg KH <greg@kroah.com>
Cc: Oliver Neukum <oliver@neukum.org>
Cc: Elina Pasheva <epasheva@sierrawireless.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/usb/serial/sierra.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index 68fa0e43b78..8c075b2416b 100644 --- a/drivers/usb/serial/sierra.c +++ b/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 = { |