diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 12:22:24 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-01 12:22:24 -0400 |
| commit | 32527bc0e4b4fa7711ad1c923cf64ae72a7ffd9d (patch) | |
| tree | 397c7ea179ebd3d2dacc0a2c8b165f8840137045 /drivers/char | |
| parent | e14a685dfabf3ceeb366f1db1a22471b8f98a08b (diff) | |
| parent | 99f6a570eedc885675b6aa36b7acdbdcc3a7f55b (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] cio: online_store - trigger recognition for boxed devices
[S390] cio: disallow online setting of device in transient state
[S390] cio: introduce notifier for boxed state
[S390] cio: introduce ccw_device_schedule_sch_unregister
[S390] cio: wake up on failed recognition
[S390] fix hypfs build failure
[PATCH] sysrq: include interrupt.h instead of irq.h
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/sysrq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/sysrq.c b/drivers/char/sysrq.c index 5afe7316c72..ebea9b2c30a 100644 --- a/drivers/char/sysrq.c +++ b/drivers/char/sysrq.c | |||
| @@ -35,7 +35,7 @@ | |||
| 35 | #include <linux/vt_kern.h> | 35 | #include <linux/vt_kern.h> |
| 36 | #include <linux/workqueue.h> | 36 | #include <linux/workqueue.h> |
| 37 | #include <linux/kexec.h> | 37 | #include <linux/kexec.h> |
| 38 | #include <linux/irq.h> | 38 | #include <linux/interrupt.h> |
| 39 | #include <linux/hrtimer.h> | 39 | #include <linux/hrtimer.h> |
| 40 | #include <linux/oom.h> | 40 | #include <linux/oom.h> |
| 41 | 41 | ||