diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2010-03-25 11:29:16 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-20 13:21:32 -0700 |
| commit | 7f0ae3a8eeb7f231dc99cee7c871ba64e07ebefe (patch) | |
| tree | 1a51ce3eae9193b6fbc4bdb05e4f47716442c7c4 /drivers/usb/serial/generic.c | |
| parent | 2a1e7d5d54c1c046c1fe47dffd119b45087c6de6 (diff) | |
| download | kernel_samsung_smdk4412-7f0ae3a8eeb7f231dc99cee7c871ba64e07ebefe.zip kernel_samsung_smdk4412-7f0ae3a8eeb7f231dc99cee7c871ba64e07ebefe.tar.gz kernel_samsung_smdk4412-7f0ae3a8eeb7f231dc99cee7c871ba64e07ebefe.tar.bz2 | |
usb: fix serial build when SYSRQ is disabled
Fix build error when CONFIG_MAGIC_SYSRQ is not enabled:
drivers/usb/serial/generic.c:566: error: implicit declaration of function 'handle_sysrq'
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/serial/generic.c')
| -rw-r--r-- | drivers/usb/serial/generic.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/usb/serial/generic.c b/drivers/usb/serial/generic.c index ba61c74..a5e6109 100644 --- a/drivers/usb/serial/generic.c +++ b/drivers/usb/serial/generic.c @@ -12,6 +12,7 @@ #include <linux/kernel.h> #include <linux/errno.h> #include <linux/slab.h> +#include <linux/sysrq.h> #include <linux/tty.h> #include <linux/tty_flip.h> #include <linux/module.h> @@ -558,6 +559,7 @@ void usb_serial_generic_unthrottle(struct tty_struct *tty) } } +#ifdef CONFIG_MAGIC_SYSRQ int usb_serial_handle_sysrq_char(struct tty_struct *tty, struct usb_serial_port *port, unsigned int ch) { @@ -571,6 +573,13 @@ int usb_serial_handle_sysrq_char(struct tty_struct *tty, } return 0; } +#else +int usb_serial_handle_sysrq_char(struct tty_struct *tty, + struct usb_serial_port *port, unsigned int ch) +{ + return 0; +} +#endif EXPORT_SYMBOL_GPL(usb_serial_handle_sysrq_char); int usb_serial_handle_break(struct usb_serial_port *port) |