diff options
| author | Pierre Ossman <drzeus@drzeus.cx> | 2008-12-31 13:56:05 -0500 |
|---|---|---|
| committer | Pierre Ossman <drzeus@drzeus.cx> | 2008-12-31 13:56:05 -0500 |
| commit | 418f19ea17a99421b22a64e101e14b6a16bed66d (patch) | |
| tree | 7c21fcc368c63f1f9907deac6d16b30bd371792d /include/linux/interrupt.h | |
| parent | 98444d3dd975653a4a970ecc0dfc30918da92f60 (diff) | |
| parent | f6e10b865c3ea56bdaa8c6ecfee313b997900dbb (diff) | |
Merge branch 'master' of ../mmc
Diffstat (limited to 'include/linux/interrupt.h')
| -rw-r--r-- | include/linux/interrupt.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index f58a0cf8929a..be3c484b5242 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> |
| @@ -251,9 +253,6 @@ enum | |||
| 251 | BLOCK_SOFTIRQ, | 253 | BLOCK_SOFTIRQ, |
| 252 | TASKLET_SOFTIRQ, | 254 | TASKLET_SOFTIRQ, |
| 253 | SCHED_SOFTIRQ, | 255 | SCHED_SOFTIRQ, |
| 254 | #ifdef CONFIG_HIGH_RES_TIMERS | ||
| 255 | HRTIMER_SOFTIRQ, | ||
| 256 | #endif | ||
| 257 | RCU_SOFTIRQ, /* Preferable RCU should always be the last softirq */ | 256 | RCU_SOFTIRQ, /* Preferable RCU should always be the last softirq */ |
| 258 | 257 | ||
| 259 | NR_SOFTIRQS | 258 | NR_SOFTIRQS |