diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-31 09:00:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-12-31 09:00:59 -0800 |
| commit | db200df0b3530f673d8e9f5bd535e9e10305842a (patch) | |
| tree | 9a94039b8813452c51a50fcb45e95c32a9f0e537 /kernel/hrtimer.c | |
| parent | ec270e59a74eee972006a87c8e12514a20588369 (diff) | |
| parent | 43a256322ac1fc105c181b3cade3b9bfc0b63ca1 (diff) | |
| download | op-kernel-dev-db200df0b3530f673d8e9f5bd535e9e10305842a.zip op-kernel-dev-db200df0b3530f673d8e9f5bd535e9e10305842a.tar.gz | |
Merge branch 'irq-fixes-for-linus-4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'irq-fixes-for-linus-4' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sparseirq: move __weak symbols into separate compilation unit
sparseirq: work around __weak alias bug
sparseirq: fix hang with !SPARSE_IRQ
sparseirq: set lock_class for legacy irq when sparse_irq is selected
sparseirq: work around compiler optimizing away __weak functions
sparseirq: fix desc->lock init
sparseirq: do not printk when migrating IRQ descriptors
sparseirq: remove duplicated arch_early_irq_init()
irq: simplify for_each_irq_desc() usage
proc: remove ifdef CONFIG_SPARSE_IRQ from stat.c
irq: for_each_irq_desc() move to irqnr.h
hrtimer: remove #include <linux/irq.h>
Diffstat (limited to 'kernel/hrtimer.c')
| -rw-r--r-- | kernel/hrtimer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c index bda9cb9..eb2bfef 100644 --- a/kernel/hrtimer.c +++ b/kernel/hrtimer.c @@ -32,7 +32,6 @@ */ #include <linux/cpu.h> -#include <linux/irq.h> #include <linux/module.h> #include <linux/percpu.h> #include <linux/hrtimer.h> |
