summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-28 13:55:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-28 13:55:31 -0700
commit2637d139fb9a1bd428a003b7671fda40a034854f (patch)
tree7983e0776c95990a545f83275682614e16a71167 /drivers/net
parent494e2fbe1f8bee22ab2070bd6f4d1a24f7d5fd8b (diff)
parent288933c02b440621d9c8e7bb5f232cfb7bdef7df (diff)
downloadlinux-2637d139fb9a1bd428a003b7671fda40a034854f.tar.gz
linux-2637d139fb9a1bd428a003b7671fda40a034854f.tar.bz2
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/net')
-rw-r--r--drivers/net/ibm_newemac/debug.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ibm_newemac/debug.c b/drivers/net/ibm_newemac/debug.c
index 3995fafc1e08..8c6c1e2a8750 100644
--- a/drivers/net/ibm_newemac/debug.c
+++ b/drivers/net/ibm_newemac/debug.c
@@ -238,7 +238,7 @@ void emac_dbg_dump_all(void)
}
#if defined(CONFIG_MAGIC_SYSRQ)
-static void emac_sysrq_handler(int key, struct tty_struct *tty)
+static void emac_sysrq_handler(int key)
{
emac_dbg_dump_all();
}