diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 13:55:31 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-28 13:55:31 -0700 |
commit | 2637d139fb9a1bd428a003b7671fda40a034854f (patch) | |
tree | 7983e0776c95990a545f83275682614e16a71167 /arch/um | |
parent | 494e2fbe1f8bee22ab2070bd6f4d1a24f7d5fd8b (diff) | |
parent | 288933c02b440621d9c8e7bb5f232cfb7bdef7df (diff) | |
download | kernel_samsung_crespo-2637d139fb9a1bd428a003b7671fda40a034854f.zip kernel_samsung_crespo-2637d139fb9a1bd428a003b7671fda40a034854f.tar.gz kernel_samsung_crespo-2637d139fb9a1bd428a003b7671fda40a034854f.tar.bz2 |
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 'arch/um')
-rw-r--r-- | arch/um/drivers/mconsole_kern.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/drivers/mconsole_kern.c b/arch/um/drivers/mconsole_kern.c index de317d0..ebc6807 100644 --- a/arch/um/drivers/mconsole_kern.c +++ b/arch/um/drivers/mconsole_kern.c @@ -690,7 +690,7 @@ static void with_console(struct mc_request *req, void (*proc)(void *), static void sysrq_proc(void *arg) { char *op = arg; - handle_sysrq(*op, NULL); + handle_sysrq(*op); } void mconsole_sysrq(struct mc_request *req) |