summaryrefslogtreecommitdiffstats
path: root/include/acpi
diff options
context:
space:
mode:
authorLen Brown <len.brown@intel.com>2008-02-07 09:07:55 +0100
committerLen Brown <len.brown@intel.com>2008-02-07 09:07:55 +0100
commit8f859016ea49cd8d7c743533bd1ab3db9a813ffa (patch)
tree6bf8238b2d1635e6f7f04ac199b63fab4b3bd834 /include/acpi
parentMerge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release (diff)
parentACPI: Also autoload the bay driver, was forgotten... (diff)
downloadlinux-8f859016ea49cd8d7c743533bd1ab3db9a813ffa.tar.xz
linux-8f859016ea49cd8d7c743533bd1ab3db9a813ffa.zip
Merge branches 'release' and 'autoload' into release
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/acpi_drivers.h1
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