diff options
author | Len Brown <len.brown@intel.com> | 2008-02-07 03:07:55 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-02-07 03:07:55 -0500 |
commit | 8f859016ea49cd8d7c743533bd1ab3db9a813ffa (patch) | |
tree | 6bf8238b2d1635e6f7f04ac199b63fab4b3bd834 /include | |
parent | dd07a8db7283f52f347aee468007556944b5b393 (diff) | |
parent | 17196d6e533a5c09ca57bf398099ffa3c13248b1 (diff) | |
download | linux-stable-8f859016ea49cd8d7c743533bd1ab3db9a813ffa.tar.gz linux-stable-8f859016ea49cd8d7c743533bd1ab3db9a813ffa.tar.bz2 linux-stable-8f859016ea49cd8d7c743533bd1ab3db9a813ffa.zip |
Merge branches 'release' and 'autoload' into release
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acpi_drivers.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index f85f77a538aa..581daa451ffc 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h @@ -48,6 +48,7 @@ #define ACPI_BUTTON_HID_SLEEPF "LNXSLPBN" #define ACPI_VIDEO_HID "LNXVIDEO" #define ACPI_BAY_HID "LNXIOBAY" +#define ACPI_DOCK_HID "LNXDOCK" /* -------------------------------------------------------------------------- PCI |