1 files changed, 16 insertions, 5 deletions

diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index cf04c6011c2a..e6e90208147b 100644
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
@@ -31,8 +31,24 @@
 
 #define ACPI_MAX_STRING                 80
 
+/*
+ * Please update drivers/acpi/debug.c and Documentation/acpi/debug.txt
+ * if you add to this list.
+ */
 #define ACPI_BUS_COMPONENT              0x00010000
+#define ACPI_AC_COMPONENT               0x00020000
+#define ACPI_BATTERY_COMPONENT          0x00040000
+#define ACPI_BUTTON_COMPONENT           0x00080000
+#define ACPI_SBS_COMPONENT              0x00100000
+#define ACPI_FAN_COMPONENT              0x00200000
+#define ACPI_PCI_COMPONENT              0x00400000
+#define ACPI_POWER_COMPONENT            0x00800000
+#define ACPI_CONTAINER_COMPONENT        0x01000000
 #define ACPI_SYSTEM_COMPONENT           0x02000000
+#define ACPI_THERMAL_COMPONENT          0x04000000
+#define ACPI_MEMORY_DEVICE_COMPONENT    0x08000000
+#define ACPI_VIDEO_COMPONENT            0x10000000
+#define ACPI_PROCESSOR_COMPONENT        0x20000000
 
 /*
  * _HID definitions
@@ -54,7 +70,6 @@
                                        PCI
    -------------------------------------------------------------------------- */
 
-#define ACPI_PCI_COMPONENT              0x00400000
 
 /* ACPI PCI Interrupt Link (pci_link.c) */
 
@@ -86,7 +101,6 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain,
                                   Power Resource
    -------------------------------------------------------------------------- */
 
-#ifdef CONFIG_ACPI_POWER
 int acpi_device_sleep_wake(struct acpi_device *dev,
                            int enable, int sleep_state, int dev_state);
 int acpi_enable_wakeup_device_power(struct acpi_device *dev, int sleep_state);
@@ -94,15 +108,12 @@ int acpi_disable_wakeup_device_power(struct acpi_device *dev);
 int acpi_power_get_inferred_state(struct acpi_device *device);
 int acpi_power_transition(struct acpi_device *device, int state);
 extern int acpi_power_nocheck;
-#endif
 
 /* --------------------------------------------------------------------------
                                   Embedded Controller
    -------------------------------------------------------------------------- */
-#ifdef CONFIG_ACPI_EC
 int acpi_ec_ecdt_probe(void);
 int acpi_boot_ec_enable(void);
-#endif
 
 /* --------------------------------------------------------------------------
                                     Processor