Merge branches 'release' and 'stats' into release

[sfrench/cifs-2.6.git] / drivers / acpi / dock.c

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 6192c8be66df62587e0ee49e3af2a31b145b38bc..b3dec2101e2e7ac7e28b43f5e4280fcb20831fcf 100644 (file)
--- 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;
@@ -336,13 +342,13 @@ static void hotplug_dock_devices(struct dock_station *ds, u32 event)
 static void dock_event(struct dock_station *ds, u32 event, int num)
 {
        struct device *dev = &dock_device->dev;
-       char event_string[7];
+       char event_string[13];
        char *envp[] = { event_string, NULL };
 
        if (num == UNDOCK_EVENT)
-               sprintf(event_string, "UNDOCK");
+               sprintf(event_string, "EVENT=undock");
        else
-               sprintf(event_string, "DOCK");
+               sprintf(event_string, "EVENT=dock");
 
        /*
         * Indicate that the status of the dock station has