diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-03 22:06:19 -0400 |
| commit | 3c8c7b2f32c52b259daa7564fefd582146799b23 (patch) | |
| tree | 59ff1ad0d6b7821d474d8fccafd884703684b6d7 /arch/i386/kernel/apic.c | |
| parent | 7cb3cd090c2725b80561958a362c2ba15a7a8c86 (diff) | |
| parent | 9123e0d78990246304fe681167b8d8097f1e02d7 (diff) | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'arch/i386/kernel/apic.c')
| -rw-r--r-- | arch/i386/kernel/apic.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c index a22a866de8f9..5546ddebec33 100644 --- a/arch/i386/kernel/apic.c +++ b/arch/i386/kernel/apic.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/init.h> | 18 | #include <linux/init.h> |
| 19 | 19 | ||
| 20 | #include <linux/mm.h> | 20 | #include <linux/mm.h> |
| 21 | #include <linux/irq.h> | ||
| 22 | #include <linux/delay.h> | 21 | #include <linux/delay.h> |
| 23 | #include <linux/bootmem.h> | 22 | #include <linux/bootmem.h> |
| 24 | #include <linux/smp_lock.h> | 23 | #include <linux/smp_lock.h> |