diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 09:13:53 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 09:13:53 -0700 |
| commit | da104a83692cf07434ab3b20bf10093bdbc3f97e (patch) | |
| tree | 6343600c318c600f0dcdf71406bf7d993823afd4 /drivers/s390/char/ctrlchar.c | |
| parent | 96e1a87392293cf895ea99ab70758453897c7bbf (diff) | |
| parent | dc64bef5439c8e1fafea225054da4d8882c9d10c (diff) | |
| download | op-kernel-dev-da104a83692cf07434ab3b20bf10093bdbc3f97e.zip op-kernel-dev-da104a83692cf07434ab3b20bf10093bdbc3f97e.tar.gz | |
Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6:
[S390] Use CONFIG_GENERIC_TIME and define TOD clock source.
[PATCH] sysrq: irq change build fix.
[S390] irq change build fixes.
[S390] cio: 0 is a valid chpid.
[S390] monwriter buffer limit.
[S390] ap bus poll thread priority.
Diffstat (limited to 'drivers/s390/char/ctrlchar.c')
| -rw-r--r-- | drivers/s390/char/ctrlchar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/s390/char/ctrlchar.c b/drivers/s390/char/ctrlchar.c index d83eb63..49e9628 100644 --- a/drivers/s390/char/ctrlchar.c +++ b/drivers/s390/char/ctrlchar.c @@ -20,7 +20,7 @@ static int ctrlchar_sysrq_key; static void ctrlchar_handle_sysrq(void *tty) { - handle_sysrq(ctrlchar_sysrq_key, NULL, (struct tty_struct *) tty); + handle_sysrq(ctrlchar_sysrq_key, (struct tty_struct *) tty); } static DECLARE_WORK(ctrlchar_work, ctrlchar_handle_sysrq, NULL); |
