[-next PATCH] Fix s390 keyboard driver build break

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Sachin Sant
Date: Saturday, August 21, 2010 - 12:21 am

Next 20100820 fails to build on s390 with 

drivers/s390/char/keyboard.c: In function 'kbd_keycode':
drivers/s390/char/keyboard.c:308: error: too many arguments to function 'handle_sysrq'
make[2]: *** [drivers/s390/char/keyboard.o] Error 1

The following commit changed handle_sysrq() function to accept single argument. 

commit a821bafce37b26499e2bfbf2e6b96b0636efc014
Input: sysrq - drop tty argument form handle_sysrq()

Adapt the code accordingly to fix the build break.

Signed-off-by: Sachin Sant <sachinp@in.ibm.com>
---

diff -Naurp next20100820/drivers/s390/char/keyboard.c next20100820-new//drivers/s390/char/keyboard.c
--- next20100820/drivers/s390/char/keyboard.c	2010-08-16 06:11:37.000000000 +0530
+++ next20100820-new//drivers/s390/char/keyboard.c	2010-08-21 11:55:25.000000000 +0530
@@ -305,7 +305,7 @@ kbd_keycode(struct kbd_data *kbd, unsign
 		if (kbd->sysrq) {
 			if (kbd->sysrq == K(KT_LATIN, '-')) {
 				kbd->sysrq = 0;
-				handle_sysrq(value, kbd->tty);
+				handle_sysrq(value);
 				return;
 			}
 			if (value == '-') {
--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[-next PATCH] Fix s390 keyboard driver build break, Sachin Sant, (Sat Aug 21, 12:21 am)
Re: [-next PATCH] Fix s390 keyboard driver build break, Dmitry Torokhov, (Sat Aug 21, 12:40 am)