---

yaml --- r: 84091 b: refs/heads/master c: a340af1 h: refs/heads/master i: 84089: e745b61 84087: 9436bc1 v: v3
git-mirror · Dec 8, 2007 · 93997ba · 93997ba
1 parent 7b242bd
commit 93997ba
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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