diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-08 03:53:57 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 03:53:57 -0400 |
| commit | 1b8ba39a3fad9c58532f6dad12c94d6e675be656 (patch) | |
| tree | 9ae9b4c4545b4c91f5dbb3a1085c4c721961c4f2 /include/linux/kernel_stat.h | |
| parent | 58cf35228fec541418cc3bd781d6c069d904815e (diff) | |
| parent | cbd6712406a3ea861b49fbfd46e23cbf5f8e073f (diff) | |
Merge branch 'x86/irq' into x86/devel
Conflicts:
arch/x86/kernel/i8259.c
arch/x86/kernel/irqinit_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/kernel_stat.h')
| -rw-r--r-- | include/linux/kernel_stat.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index e8ffce898bf9..cf9f40a91c9c 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | #ifndef _LINUX_KERNEL_STAT_H | 1 | #ifndef _LINUX_KERNEL_STAT_H |
| 2 | #define _LINUX_KERNEL_STAT_H | 2 | #define _LINUX_KERNEL_STAT_H |
| 3 | 3 | ||
| 4 | #include <asm/irq.h> | ||
| 5 | #include <linux/smp.h> | 4 | #include <linux/smp.h> |
| 6 | #include <linux/threads.h> | 5 | #include <linux/threads.h> |
| 7 | #include <linux/percpu.h> | 6 | #include <linux/percpu.h> |
| 8 | #include <linux/cpumask.h> | 7 | #include <linux/cpumask.h> |
| 8 | #include <asm/irq.h> | ||
| 9 | #include <asm/cputime.h> | 9 | #include <asm/cputime.h> |
| 10 | 10 | ||
| 11 | /* | 11 | /* |