diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-18 15:42:10 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-18 15:42:10 +0400 |
| commit | 981984cbd09e41c05b4ec6260e3f68591354cd54 (patch) | |
| tree | 0cf2202a8ec37e134c2507907d4b9a8d5f9460e8 /drivers/acpi/scan.c | |
| parent | bdbff71653db2da9c69ff29a02764c388649d08d (diff) | |
| parent | 2421ad48f4aed63bc890e8f3c53ed581a542fb66 (diff) | |
| download | linux-981984cbd09e41c05b4ec6260e3f68591354cd54.tar.xz | |
Merge branch 'acpi-fixes'
* acpi-fixes:
ACPI / PM: Drop two functions that are not used any more
ATA / ACPI: remove power dependent device handling
ACPI / power: Drop automaitc resume of power resource dependent devices
ACPI: remove /proc/acpi/event from ACPI_BUTTON help
ACPI / power: Release resource_lock after acpi_power_get_state() return error
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 407ad13cac2f..fee8a297c7d9 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -999,7 +999,6 @@ int acpi_device_add(struct acpi_device *device, INIT_LIST_HEAD(&device->wakeup_list); INIT_LIST_HEAD(&device->physical_node_list); mutex_init(&device->physical_node_lock); - INIT_LIST_HEAD(&device->power_dependent); new_bus_id = kzalloc(sizeof(struct acpi_device_bus_id), GFP_KERNEL); if (!new_bus_id) { |