Pull dock into release branch

git-mirror · Jul 10, 2006 · 0466684 · 0466684
2 parents c0dc250 + 07a1868
commit 0466684
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
@@ -627,6 +627,7 @@ static int dock_add(acpi_handle handle)
 	INIT_LIST_HEAD(&dock_station->hotplug_devices);
 	spin_lock_init(&dock_station->dd_lock);
 	spin_lock_init(&dock_station->hp_lock);
+	ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list);
 
 	/* Find dependent devices */
 	acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT,