summaryrefslogtreecommitdiff
path: root/drivers/acpi/cm_sbs.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-11 05:41:39 +0300
committerIngo Molnar <mingo@elte.hu>2009-01-11 05:41:39 +0300
commitabede81c4fb2e3b85d8760f25e3da39d2c69a134 (patch)
tree26c893ec108d837eb9171d678c55a1cea7b22af4 /drivers/acpi/cm_sbs.c
parentc9d557c19f94df42db78d4a5de4d25feee694bad (diff)
parentc59765042f53a79a7a65585042ff463b69cb248c (diff)
downloadlinux-abede81c4fb2e3b85d8760f25e3da39d2c69a134.tar.xz
Merge commit 'v2.6.29-rc1' into core/urgent
Diffstat (limited to 'drivers/acpi/cm_sbs.c')
-rw-r--r--drivers/acpi/cm_sbs.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/acpi/cm_sbs.c b/drivers/acpi/cm_sbs.c
index 307963bd1043..332fe4b21708 100644
--- a/drivers/acpi/cm_sbs.c
+++ b/drivers/acpi/cm_sbs.c
@@ -27,9 +27,6 @@
#include <linux/seq_file.h>
#include <acpi/acpi_bus.h>
#include <acpi/acpi_drivers.h>
-#include <acpi/acmacros.h>
-#include <acpi/actypes.h>
-#include <acpi/acutils.h>
ACPI_MODULE_NAME("cm_sbs");
#define ACPI_AC_CLASS "ac_adapter"