Merge acpi3.jf.intel.com:/root/bk/linux-2.5

into acpi3.jf.intel.com:/root/bk/linux-acpi

Merge acpi3.jf.intel.com:/root/bk/linux-2.5
into acpi3.jf.intel.com:/root/bk/linux-acpi
034d330b · Andy Grover · d572f1a5 · 0e37c527 · 034d330b
Commit 034d330b authored Aug 13, 2002 by Andy Grover
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

arch/i386/kernel/acpi.c arch/i386/kernel/acpi.c +0 -1

No files found.
--- a/arch/i386/kernel/acpi.c
+++ b/arch/i386/kernel/acpi.c
@@ -32,7 +32,6 @@
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/bootmem.h>
-#include <linux/slab.h>
 #include <linux/irq.h>
 #include <linux/acpi.h>
 #include <asm/mpspec.h>