Pull dock into release branch

04666849 · Len Brown <[email protected]> · 2006-07-10 14:20:17 -04:00

Merge commit. Changes below are compared with the first parent: c0dc250e.

Changes

1 files changed · +1 −0

File	Status	Add	Del	Content
drivers/acpi/dock.c	modified	+1	−0	View file

diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c
index 510a945..1c0a39d 100644
--- 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,