diff options
| author | Linus Torvalds | 2010-08-28 22:55:31 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2010-08-28 22:55:31 +0200 |
| commit | 2637d139fb9a1bd428a003b7671fda40a034854f (patch) | |
| tree | 7983e0776c95990a545f83275682614e16a71167 /drivers/gpu | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | Input: pxa27x_keypad - remove input_free_device() in pxa27x_keypad_remove() (diff) | |
| download | kernel-qcow2-linux-2637d139fb9a1bd428a003b7671fda40a034854f.tar.gz kernel-qcow2-linux-2637d139fb9a1bd428a003b7671fda40a034854f.tar.xz kernel-qcow2-linux-2637d139fb9a1bd428a003b7671fda40a034854f.zip | |
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 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/drm_fb_helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index 8dd7e6f86bb3..6a5e403f9aa1 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -370,7 +370,7 @@ static void drm_fb_helper_restore_work_fn(struct work_struct *ignored) } static DECLARE_WORK(drm_fb_helper_restore_work, drm_fb_helper_restore_work_fn); -static void drm_fb_helper_sysrq(int dummy1, struct tty_struct *dummy3) +static void drm_fb_helper_sysrq(int dummy1) { schedule_work(&drm_fb_helper_restore_work); } |