diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-07-27 14:27:06 -0400 |
| commit | 20f99dcf417a28089ef6c877ae97f5dec2eab435 (patch) | |
| tree | b4fe1f3e429d6a82ddaaa8e12899da630cfa8a63 /drivers/acpi/dock.c | |
| parent | dd2f5538a157bda68bfa8efb39feaaccdda9e74e (diff) | |
| parent | 64821324ca49f24be1a66f2f432108f96a24e596 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'drivers/acpi/dock.c')
| -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, |