diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-23 00:47:29 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-07-23 00:47:29 -0400 |
| commit | bd072111e7319d90a7b8127f91c2806b9a6f279e (patch) | |
| tree | 1686978814a2387ebfc16f9f5778a7f0caaf319b /include/linux/hardirq.h | |
| parent | 24d01c0681bfbc10a99304c48a89ad213d2d7a4b (diff) | |
| parent | 4be3bd7849165e7efa6b0b35a23d6a3598d97465 (diff) | |
Merge commit 'v2.6.31-rc4' into next
Diffstat (limited to 'include/linux/hardirq.h')
| -rw-r--r-- | include/linux/hardirq.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/hardirq.h b/include/linux/hardirq.h index 45257475623c..8246c697863d 100644 --- a/include/linux/hardirq.h +++ b/include/linux/hardirq.h | |||
| @@ -2,7 +2,9 @@ | |||
| 2 | #define LINUX_HARDIRQ_H | 2 | #define LINUX_HARDIRQ_H |
| 3 | 3 | ||
| 4 | #include <linux/preempt.h> | 4 | #include <linux/preempt.h> |
| 5 | #ifdef CONFIG_PREEMPT | ||
| 5 | #include <linux/smp_lock.h> | 6 | #include <linux/smp_lock.h> |
| 7 | #endif | ||
| 6 | #include <linux/lockdep.h> | 8 | #include <linux/lockdep.h> |
| 7 | #include <linux/ftrace_irq.h> | 9 | #include <linux/ftrace_irq.h> |
| 8 | #include <asm/hardirq.h> | 10 | #include <asm/hardirq.h> |