git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
s390
/
char
/
ctrlchar.c
diff --git
a/drivers/s390/char/ctrlchar.c
b/drivers/s390/char/ctrlchar.c
index
be46324
..
d83eb63
100644
(file)
--- a/
drivers/s390/char/ctrlchar.c
+++ b/
drivers/s390/char/ctrlchar.c
@@
-7,7
+7,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/stddef.h>
#include <asm/errno.h>
#include <linux/sysrq.h>
#include <linux/stddef.h>
#include <asm/errno.h>
#include <linux/sysrq.h>
@@
-24,7
+23,7
@@
ctrlchar_handle_sysrq(void *tty)
handle_sysrq(ctrlchar_sysrq_key, NULL, (struct tty_struct *) tty);
}
handle_sysrq(ctrlchar_sysrq_key, NULL, (struct tty_struct *) tty);
}
-static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq,
0
);
+static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq,
NULL
);
#endif
#endif