From b110adce0e8a34a9a2442141d143b4ae16dce8b7 Mon Sep 17 00:00:00 2001 From: Alex Chiang Date: Mon, 19 Oct 2009 15:14:35 -0600 Subject: [PATCH] --- yaml --- r: 177577 b: refs/heads/master c: c6f1905ea91bf56a921c6eb574488869c8c3eeff h: refs/heads/master i: 177575: ec702b30da04e99d8438067339087fb78af743c6 v: v3 --- [refs] | 2 +- trunk/drivers/acpi/dock.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 270b95955c31..3349eff23181 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f69cfdd24ac40ab7bbd00d6ad85e003da755e3a0 +refs/heads/master: c6f1905ea91bf56a921c6eb574488869c8c3eeff diff --git a/trunk/drivers/acpi/dock.c b/trunk/drivers/acpi/dock.c index ee9829b47e20..0a1221854a25 100644 --- a/trunk/drivers/acpi/dock.c +++ b/trunk/drivers/acpi/dock.c @@ -50,7 +50,6 @@ MODULE_PARM_DESC(immediate_undock, "1 (default) will cause the driver to " " before undocking"); static struct atomic_notifier_head dock_notifier_list; -static char dock_device_name[] = "dock"; static const struct acpi_device_id dock_device_ids[] = { {"LNXDOCK", 0}, @@ -964,7 +963,7 @@ static int dock_add(acpi_handle handle) /* initialize platform device stuff */ dock_station->dock_device = - platform_device_register_simple(dock_device_name, + platform_device_register_simple("dock", dock_station_count, NULL, 0); dock_device = dock_station->dock_device; if (IS_ERR(dock_device)) {