diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 12:13:53 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-06 12:13:53 -0400 |
| commit | da104a83692cf07434ab3b20bf10093bdbc3f97e (patch) | |
| tree | 6343600c318c600f0dcdf71406bf7d993823afd4 /drivers/char/sysrq.c | |
| parent | 96e1a87392293cf895ea99ab70758453897c7bbf (diff) | |
| parent | dc64bef5439c8e1fafea225054da4d8882c9d10c (diff) | |
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/char/sysrq.c')
| -rw-r--r-- | drivers/char/sysrq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 4c0e086857..5f49280779 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c | |||
| @@ -38,6 +38,7 @@ | |||
| 38 | #include <linux/irq.h> | 38 | #include <linux/irq.h> |
| 39 | 39 | ||
| 40 | #include <asm/ptrace.h> | 40 | #include <asm/ptrace.h> |
| 41 | #include <asm/irq_regs.h> | ||
| 41 | 42 | ||
| 42 | /* Whether we react on sysrq keys or just ignore them */ | 43 | /* Whether we react on sysrq keys or just ignore them */ |
| 43 | int sysrq_enabled = 1; | 44 | int sysrq_enabled = 1; |