This is a note to let you know that I've just added the patch titled
Subject: USB: let the option driver compile without CONFIG_PM
to my gregkh-2.6 tree. Its filename is
usb-let-the-option-driver-compile-without-config_pm.patch
This tree can be found at
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/
>From oliver@xxxxxxxxxx Wed Jul 15 06:31:25 2009
From: Oliver Neukum <oliver@xxxxxxxxxx>
Date: Mon, 13 Jul 2009 23:24:10 +0200
Subject: USB: let the option driver compile without CONFIG_PM
To: Randy Dunlap <randy.dunlap@xxxxxxxxxx>, Greg KH <greg@xxxxxxxxx>, USB list <linux-usb@xxxxxxxxxxxxxxx>, "zhao1980ming" <zhao1980ming@xxxxxxx>
Message-ID: <200907132324.11444.oliver@xxxxxxxxxx>
Content-Disposition: inline
This is needed for compilation without CONFIG_PM.
Signed-off-by: Oliver Neukum <oliver@xxxxxxxxxx>
Acked-by: Randy Dunlap <randy.dunlap@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/usb/serial/option.c | 8 ++++++++
1 file changed, 8 insertions(+)
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -66,8 +66,10 @@ static int option_tiocmget(struct tty_s
static int option_tiocmset(struct tty_struct *tty, struct file *file,
unsigned int set, unsigned int clear);
static int option_send_setup(struct usb_serial_port *port);
+#ifdef CONFIG_PM
static int option_suspend(struct usb_serial *serial, pm_message_t message);
static int option_resume(struct usb_serial *serial);
+#endif
/* Vendor and product IDs */
#define OPTION_VENDOR_ID 0x0AF0
@@ -555,8 +557,10 @@ static struct usb_driver option_driver =
.name = "option",
.probe = usb_serial_probe,
.disconnect = usb_serial_disconnect,
+#ifdef CONFIG_PM
.suspend = usb_serial_suspend,
.resume = usb_serial_resume,
+#endif
.id_table = option_ids,
.no_dynamic_id = 1,
};
@@ -588,8 +592,10 @@ static struct usb_serial_driver option_1
.disconnect = option_disconnect,
.release = option_release,
.read_int_callback = option_instat_callback,
+#ifdef CONFIG_PM
.suspend = option_suspend,
.resume = option_resume,
+#endif
};
static int debug;
@@ -1185,6 +1191,7 @@ static void option_release(struct usb_se
}
}
+#ifdef CONFIG_PM
static int option_suspend(struct usb_serial *serial, pm_message_t message)
{
dbg("%s entered", __func__);
@@ -1243,6 +1250,7 @@ static int option_resume(struct usb_seri
}
return 0;
}
+#endif
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
