diff options
author | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 23:59:58 +0200 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-05-08 23:59:58 +0200 |
commit | d7be0ce6afb1df60bc786f57410407ceae92b994 (patch) | |
tree | 5e91acfc12c833531ad3320f274e0cd96a129973 /drivers/acpi/pci_slot.c | |
parent | x86: Clean up the hypervisor layer (diff) | |
parent | Linux 2.6.34-rc6 (diff) | |
download | linux-d7be0ce6afb1df60bc786f57410407ceae92b994.tar.xz linux-d7be0ce6afb1df60bc786f57410407ceae92b994.zip |
Merge commit 'v2.6.34-rc6' into x86/cpu
Diffstat (limited to 'drivers/acpi/pci_slot.c')
-rw-r--r-- | drivers/acpi/pci_slot.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/pci_slot.c b/drivers/acpi/pci_slot.c index 11f219743204..07f7fea8a4e2 100644 --- a/drivers/acpi/pci_slot.c +++ b/drivers/acpi/pci_slot.c @@ -26,6 +26,7 @@ #include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h> +#include <linux/slab.h> #include <linux/types.h> #include <linux/pci.h> #include <linux/acpi.h> |