Commit 034d330b authored by Andy Grover's avatar Andy Grover

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

into acpi3.jf.intel.com:/root/bk/linux-acpi
parents d572f1a5 0e37c527
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/pci.h> #include <linux/pci.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/slab.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/acpi.h> #include <linux/acpi.h>
#include <asm/mpspec.h> #include <asm/mpspec.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment