diff options
| author | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2009-12-14 13:23:03 -0500 |
| commit | 559300bc0ef7ccd541656f1189d38e7088389559 (patch) | |
| tree | cd1682881ca4246e9c5a1e8632be4bdd9d9706c6 /arch/um/kernel/irq.c | |
| parent | 5416bf33f92a4104dbcd6062bf377c8421ca3cfd (diff) | |
| parent | 22763c5cf3690a681551162c15d34d935308c8d7 (diff) | |
Merge commit 'v2.6.32'
Conflicts:
arch/avr32/mach-at32ap/include/mach/cpu.h
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" |