diff options
| author | Dave Airlie <airlied@starflyer.(none)> | 2005-10-20 04:21:33 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2005-10-20 04:21:33 -0400 |
| commit | 312f5726055534be1dc9dd369be13aabd2943fcb (patch) | |
| tree | 29394a3f83b4952a73b36a4aa962dfeda839e9db /arch/um/kernel/irq.c | |
| parent | 3d5efad953c6d5ba11d5bcb584ef8e906f953a73 (diff) | |
| parent | 93918e9afc76717176e9e114e79cdbb602a45ae8 (diff) | |
merge Linus head tree into my drm tree and fix up conflicts
Diffstat (limited to 'arch/um/kernel/irq.c')
| -rw-r--r-- | arch/um/kernel/irq.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c index dcd814971995..bbf94bf2921e 100644 --- a/arch/um/kernel/irq.c +++ b/arch/um/kernel/irq.c | |||
| @@ -9,7 +9,6 @@ | |||
| 9 | #include "linux/kernel.h" | 9 | #include "linux/kernel.h" |
| 10 | #include "linux/module.h" | 10 | #include "linux/module.h" |
| 11 | #include "linux/smp.h" | 11 | #include "linux/smp.h" |
| 12 | #include "linux/irq.h" | ||
| 13 | #include "linux/kernel_stat.h" | 12 | #include "linux/kernel_stat.h" |
| 14 | #include "linux/interrupt.h" | 13 | #include "linux/interrupt.h" |
| 15 | #include "linux/random.h" | 14 | #include "linux/random.h" |