diff options
| author | Len Brown <len.brown@intel.com> | 2006-07-10 14:20:17 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-07-10 14:20:17 -0400 |
| commit | 0466684907ea1695eeef98cb28ca3399882ecc0a (patch) | |
| tree | ab60641f77d064c28ee508fe64b8d9515985ad2f /drivers/acpi | |
| parent | c0dc250e89cb8af77c5689b36eda851158e8573e (diff) | |
| parent | 07a18684c92c0156f87ea158b5adc3022485f82a (diff) | |
Pull dock into release branch
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/dock.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/acpi/dock.c b/drivers/acpi/dock.c index 510a94524298..1c0a39d8b04e 100644 --- a/drivers/acpi/dock.c +++ b/drivers/acpi/dock.c | |||
| @@ -627,6 +627,7 @@ static int dock_add(acpi_handle handle) | |||
| 627 | INIT_LIST_HEAD(&dock_station->hotplug_devices); | 627 | INIT_LIST_HEAD(&dock_station->hotplug_devices); |
| 628 | spin_lock_init(&dock_station->dd_lock); | 628 | spin_lock_init(&dock_station->dd_lock); |
| 629 | spin_lock_init(&dock_station->hp_lock); | 629 | spin_lock_init(&dock_station->hp_lock); |
| 630 | ATOMIC_INIT_NOTIFIER_HEAD(&dock_notifier_list); | ||
| 630 | 631 | ||
| 631 | /* Find dependent devices */ | 632 | /* Find dependent devices */ |
| 632 | acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, | 633 | acpi_walk_namespace(ACPI_TYPE_DEVICE, ACPI_ROOT_OBJECT, |