diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-11-06 10:46:18 -0500 |
| commit | 330f28f691e9b349e34adcaf82b273cf061bb491 (patch) | |
| tree | fca3bfe41eff25ef19f576cef1979c68f6521af5 /arch/um/kernel/irq.c | |
| parent | fe3e78e073d25308756f38019956061153267769 (diff) | |
| parent | 6fc786d5034ed7ce2d43c459211137de6d99dd28 (diff) | |
Merge branch 'for-2.6.32' into for-2.6.33
Diffstat (limited to 'arch/um/kernel/irq.c')
| -rw-r--r-- | arch/um/kernel/irq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index 454cdb43e351..039270b9b73b 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c | |||
| @@ -10,6 +10,7 @@ | |||
| 10 | #include "linux/interrupt.h" | 10 | #include "linux/interrupt.h" |
| 11 | #include "linux/kernel_stat.h" | 11 | #include "linux/kernel_stat.h" |
| 12 | #include "linux/module.h" | 12 | #include "linux/module.h" |
| 13 | #include "linux/sched.h" | ||
| 13 | #include "linux/seq_file.h" | 14 | #include "linux/seq_file.h" |
| 14 | #include "as-layout.h" | 15 | #include "as-layout.h" |
| 15 | #include "kern_util.h" | 16 | #include "kern_util.h" |