diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 06:25:51 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2008-12-13 06:25:51 -0500 |
| commit | 968ea6d80e395cf11a51143cfa1b9a14ada676df (patch) | |
| tree | dc2acec8c9bdced33afe1e273ee5e0b0b93d2703 /include/linux/interrupt.h | |
| parent | 7be7585393d311866653564fbcd10a3232773c0b (diff) | |
| parent | 8299608f140ae321e4eb5d1306184265d2b9511e (diff) | |
Merge ../linux-2.6-x86
Conflicts:
arch/x86/kernel/io_apic.c
kernel/sched.c
kernel/sched_stats.h
Diffstat (limited to 'include/linux/interrupt.h')
| -rw-r--r-- | include/linux/interrupt.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 48e63934fabe..7e85a6e89e41 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h | |||
| @@ -14,6 +14,8 @@ | |||
| 14 | #include <linux/irqflags.h> | 14 | #include <linux/irqflags.h> |
| 15 | #include <linux/smp.h> | 15 | #include <linux/smp.h> |
| 16 | #include <linux/percpu.h> | 16 | #include <linux/percpu.h> |
| 17 | #include <linux/irqnr.h> | ||
| 18 | |||
| 17 | #include <asm/atomic.h> | 19 | #include <asm/atomic.h> |
| 18 | #include <asm/ptrace.h> | 20 | #include <asm/ptrace.h> |
| 19 | #include <asm/system.h> | 21 | #include <asm/system.h> |