diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 16:55:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 16:55:31 -0400 |
| commit | 2637d139fb9a1bd428a003b7671fda40a034854f (patch) | |
| tree | 7983e0776c95990a545f83275682614e16a71167 /kernel/debug/debug_core.c | |
| parent | 494e2fbe1f8bee22ab2070bd6f4d1a24f7d5fd8b (diff) | |
| parent | 288933c02b440621d9c8e7bb5f232cfb7bdef7df (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: pxa27x_keypad - remove input_free_device() in pxa27x_keypad_remove()
Input: mousedev - fix regression of inverting axes
Input: uinput - add devname alias to allow module on-demand load
Input: hil_kbd - fix compile error
USB: drop tty argument from usb_serial_handle_sysrq_char()
Input: sysrq - drop tty argument form handle_sysrq()
Input: sysrq - drop tty argument from sysrq ops handlers
Diffstat (limited to 'kernel/debug/debug_core.c')
| -rw-r--r-- | kernel/debug/debug_core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c index 3c2d4972d235..de407c78178d 100644 --- a/kernel/debug/debug_core.c +++ b/kernel/debug/debug_core.c | |||
| @@ -741,7 +741,7 @@ static struct console kgdbcons = { | |||
| 741 | }; | 741 | }; |
| 742 | 742 | ||
| 743 | #ifdef CONFIG_MAGIC_SYSRQ | 743 | #ifdef CONFIG_MAGIC_SYSRQ |
| 744 | static void sysrq_handle_dbg(int key, struct tty_struct *tty) | 744 | static void sysrq_handle_dbg(int key) |
| 745 | { | 745 | { |
| 746 | if (!dbg_io_ops) { | 746 | if (!dbg_io_ops) { |
| 747 | printk(KERN_CRIT "ERROR: No KGDB I/O module available\n"); | 747 | printk(KERN_CRIT "ERROR: No KGDB I/O module available\n"); |