diff options
| author | Len Brown <len.brown@intel.com> | 2008-11-11 21:14:11 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-11-11 21:14:11 -0500 |
| commit | 3e0fe364835cecc8560cf32bb9609f4c56c5d9fa (patch) | |
| tree | be2236bd4f6f16aee24cca5217449dc03a6c1e85 /drivers/acpi/power.c | |
| parent | e911d27af43e7d28d59a96a4682e8942f0661469 (diff) | |
| parent | 32836259ff25ce97010569706cd33ba94de81d62 (diff) | |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi/power.c')
| -rw-r--r-- | drivers/acpi/power.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/acpi/power.c b/drivers/acpi/power.c index a1718e56103b..81f583f8098b 100644 --- a/drivers/acpi/power.c +++ b/drivers/acpi/power.c | |||
| @@ -44,9 +44,8 @@ | |||
| 44 | #include <acpi/acpi_bus.h> | 44 | #include <acpi/acpi_bus.h> |
| 45 | #include <acpi/acpi_drivers.h> | 45 | #include <acpi/acpi_drivers.h> |
| 46 | 46 | ||
| 47 | #define _COMPONENT ACPI_POWER_COMPONENT | 47 | #define _COMPONENT ACPI_POWER_COMPONENT |
| 48 | ACPI_MODULE_NAME("power"); | 48 | ACPI_MODULE_NAME("power"); |
| 49 | #define ACPI_POWER_COMPONENT 0x00800000 | ||
| 50 | #define ACPI_POWER_CLASS "power_resource" | 49 | #define ACPI_POWER_CLASS "power_resource" |
| 51 | #define ACPI_POWER_DEVICE_NAME "Power Resource" | 50 | #define ACPI_POWER_DEVICE_NAME "Power Resource" |
| 52 | #define ACPI_POWER_FILE_INFO "info" | 51 | #define ACPI_POWER_FILE_INFO "info" |