diff options
author | 2010-05-08 14:59:58 -0700 | |
---|---|---|
committer | 2010-05-08 14:59:58 -0700 | |
commit | d7be0ce6afb1df60bc786f57410407ceae92b994 (patch) | |
tree | 5e91acfc12c833531ad3320f274e0cd96a129973 /drivers/acpi/debug.c | |
parent | x86: Clean up the hypervisor layer (diff) | |
parent | Linux 2.6.34-rc6 (diff) | |
download | linux-dev-d7be0ce6afb1df60bc786f57410407ceae92b994.tar.xz linux-dev-d7be0ce6afb1df60bc786f57410407ceae92b994.zip |
Merge commit 'v2.6.34-rc6' into x86/cpu
Diffstat (limited to 'drivers/acpi/debug.c')
-rw-r--r-- | drivers/acpi/debug.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/debug.c b/drivers/acpi/debug.c index cc421b7ae166..146135e7a6a1 100644 --- a/drivers/acpi/debug.c +++ b/drivers/acpi/debug.c @@ -9,6 +9,7 @@ #include <linux/kernel.h> #include <linux/moduleparam.h> #include <linux/debugfs.h> +#include <linux/slab.h> #include <asm/uaccess.h> #include <acpi/acpi_drivers.h> |