summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Seidel <fseidel@suse.de>2007-12-07 13:20:42 +0100
committerLen Brown <len.brown@intel.com>2007-12-08 01:51:38 -0500
commita340af14b4c08a53c5f7d821d8bd910e17403384 (patch)
tree41eeb0f2b12f4e386e5e9271c1c84b0f453ec9a9
parent3620f2f2f39e7870cf1a4fb2e34063a142f28716 (diff)
downloadlinux-3.10-a340af14b4c08a53c5f7d821d8bd910e17403384.tar.gz
linux-3.10-a340af14b4c08a53c5f7d821d8bd910e17403384.tar.bz2
linux-3.10-a340af14b4c08a53c5f7d821d8bd910e17403384.zip
ACPI: Add autoload info to dock driver
References: https://bugzilla.novell.com/show_bug.cgi?id=302482 Signed-off-by: Thomas Renninger <trenn@novell.com> Signed-off-by: Kay Sievers <kasievers@novell.com> Signed-off-by: Frank Seidel <fseidel@suse.de> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/acpi/dock.c6
-rw-r--r--include/acpi/acpi_drivers.h1
2 files changed, 7 insertions, 0 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 1dabdf4c07b..b3dec2101e2 100644
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
@@ -51,6 +51,12 @@ static struct atomic_notifier_head dock_notifier_list;
static struct platform_device *dock_device;
static char dock_device_name[] = "dock";
+static const struct acpi_device_id dock_device_ids[] = {
+ {"LNXDOCK", 0},
+ {"", 0},
+};
+MODULE_DEVICE_TABLE(acpi, dock_device_ids);
+
struct dock_station {
acpi_handle handle;
unsigned long last_dock_time;
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h
index f85f77a538a..581daa451ff 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