diff options
| author | Len Brown <len.brown@intel.com> | 2007-02-03 01:14:35 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-02-03 01:14:35 -0500 |
| commit | 975a8e3ed2b9eab9f062a1e0ba7fe180e15204e1 (patch) | |
| tree | 59b654df0b066b6d6b8ea16f5ae581b8fb45c1d5 /include/acpi/acpi_drivers.h | |
| parent | 1fcb71b84b05ff3bfd5b5b2eca9a9b3d13a76e3a (diff) | |
| parent | bfd80223d73f80e1d1c69dace9151756b3ef3b49 (diff) | |
Pull sysfs into test branch
Conflicts:
Documentation/feature-removal-schedule.txt
include/acpi/acpi_drivers.h
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi/acpi_drivers.h')
| -rw-r--r-- | include/acpi/acpi_drivers.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index baaa734b109..4dc8a5043ef 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h @@ -36,13 +36,14 @@ /* _HID definitions */ -#define ACPI_POWER_HID "ACPI_PWR" +#define ACPI_POWER_HID "power_resource" #define ACPI_PROCESSOR_HID "ACPI0007" -#define ACPI_SYSTEM_HID "ACPI_SYS" -#define ACPI_THERMAL_HID "ACPI_THM" -#define ACPI_BUTTON_HID_POWERF "ACPI_FPB" -#define ACPI_BUTTON_HID_SLEEPF "ACPI_FSB" - +#define ACPI_SYSTEM_HID "acpi_system" +#define ACPI_THERMAL_HID "thermal" +#define ACPI_BUTTON_HID_POWERF "button_power" +#define ACPI_BUTTON_HID_SLEEPF "button_sleep" +#define ACPI_VIDEO_HID "video" +#define ACPI_BAY_HID "bay" /* -------------------------------------------------------------------------- PCI -------------------------------------------------------------------------- */ |