From 93997bae0e9cac6e99d3a9c2052a0cf523458e51 Mon Sep 17 00:00:00 2001 From: Frank Seidel Date: Fri, 7 Dec 2007 13:20:42 +0100 Subject: [PATCH] --- yaml --- r: 84091 b: refs/heads/master c: a340af14b4c08a53c5f7d821d8bd910e17403384 h: refs/heads/master i: 84089: e745b616e893db01f39361179a90c3fe5ab20dd7 84087: 9436bc10c9153e909f7673e25b4c94a35ea4a7f9 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/dock.c | 6 ++++++ trunk/include/acpi/acpi_drivers.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 77498c8adc44..555637789acb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3620f2f2f39e7870cf1a4fb2e34063a142f28716 +refs/heads/master: a340af14b4c08a53c5f7d821d8bd910e17403384 diff --git a/trunk/drivers/acpi/dock.c b/trunk/drivers/acpi/dock.c index 1dabdf4c07b3..b3dec2101e2e 100644 --- a/trunk/drivers/acpi/dock.c +++ b/trunk/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/trunk/include/acpi/acpi_drivers.h b/trunk/include/acpi/acpi_drivers.h index f85f77a538aa..581daa451ffc 100644 --- a/trunk/include/acpi/acpi_drivers.h +++ b/trunk/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