diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:29:41 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2008-02-03 02:30:32 -0500 |
| commit | c1f3ee120bb61045b1c0a3ead620d1d65af47130 (patch) | |
| tree | 908430bf2b47fe8e96ac623ae7ab6dd5698d0938 /include/asm-cris/hardirq.h | |
| parent | e619a75ff6201b567a539e787aa9af9bc63a3187 (diff) | |
| parent | 9135f1901ee6449dfe338adf6e40e9c2025b8150 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-cris/hardirq.h')
| -rw-r--r-- | include/asm-cris/hardirq.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-cris/hardirq.h b/include/asm-cris/hardirq.h index 1c13dd3faac3..74178adeb1cd 100644 --- a/include/asm-cris/hardirq.h +++ b/include/asm-cris/hardirq.h | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | #ifndef __ASM_HARDIRQ_H | 1 | #ifndef __ASM_HARDIRQ_H |
| 2 | #define __ASM_HARDIRQ_H | 2 | #define __ASM_HARDIRQ_H |
| 3 | 3 | ||
| 4 | #include <asm/irq.h> | ||
| 4 | #include <linux/threads.h> | 5 | #include <linux/threads.h> |
| 5 | #include <linux/cache.h> | 6 | #include <linux/cache.h> |
| 6 | 7 | ||