diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-12 11:32:03 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-12 11:32:03 +0100 |
| commit | e3ee1e123183ca9847e74b7b8e2694c9e3b817a6 (patch) | |
| tree | 652a84674ed05eaa46a813de2223af0bd0168a5a /drivers/acpi/debug.c | |
| parent | 5762ba1873b0bb9faa631aaa02f533c2b9837f82 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
| download | kernel-crypto-e3ee1e123183ca9847e74b7b8e2694c9e3b817a6.tar.gz kernel-crypto-e3ee1e123183ca9847e74b7b8e2694c9e3b817a6.tar.xz kernel-crypto-e3ee1e123183ca9847e74b7b8e2694c9e3b817a6.zip | |
Merge commit 'v2.6.29-rc1' into timers/hrtimers
Conflicts:
kernel/time/tick-common.c
Diffstat (limited to 'drivers/acpi/debug.c')
| -rw-r--r-- | drivers/acpi/debug.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/debug.c b/drivers/acpi/debug.c index c4839689200..20223cbd0d1 100644 --- a/drivers/acpi/debug.c +++ b/drivers/acpi/debug.c @@ -9,7 +9,6 @@ #include <linux/moduleparam.h> #include <asm/uaccess.h> #include <acpi/acpi_drivers.h> -#include <acpi/acglobal.h> #define _COMPONENT ACPI_SYSTEM_COMPONENT ACPI_MODULE_NAME("debug"); |