diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-11-30 00:45:31 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-11-30 00:45:31 -0500 |
| commit | 01fc99864ecc678c4f1f476b2a8b64ebcb14e733 (patch) | |
| tree | 947696fdb2f76609d1a079aa6ff57a22e490d803 /include/asm-frv/hardirq.h | |
| parent | a880b11a95fab4618da412d99fc7365d723e702d (diff) | |
| parent | d2ef5ebb4c4fe141a82252d4db8d8521e6765c5a (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'include/asm-frv/hardirq.h')
| -rw-r--r-- | include/asm-frv/hardirq.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-frv/hardirq.h b/include/asm-frv/hardirq.h index 5248ca054909..685123981e8b 100644 --- a/include/asm-frv/hardirq.h +++ b/include/asm-frv/hardirq.h | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | 14 | ||
| 15 | #include <linux/config.h> | 15 | #include <linux/config.h> |
| 16 | #include <linux/threads.h> | 16 | #include <linux/threads.h> |
| 17 | #include <linux/irq.h> | ||
| 17 | 18 | ||
| 18 | typedef struct { | 19 | typedef struct { |
| 19 | unsigned int __softirq_pending; | 20 | unsigned int __softirq_pending; |