Merge branches 'acpi-scan', 'acpi-drivers', 'acpi-pm' and 'acpi-resources'
* acpi-scan: ACPI: bus: Introduce acpi_dev_get() and reuse it in ACPI code ACPI: scan: Utilize match_string() API ACPI: scan: Call acpi_get_object_info() from acpi_set_pnp_ids() ACPI: scan: Drop sta argument from acpi_init_device_object() ACPI: scan: Drop sta argument from acpi_add_single_object() ACPI: scan: Rearrange checks in acpi_bus_check_add() ACPI: scan: Fold acpi_bus_type_and_status() into its caller * acpi-drivers: ACPI: HED: Drop unused ACPI_MODULE_NAME() definition * acpi-pm: ACPI: power: Turn off unused power resources unconditionally ACPI: scan: Turn off unused power resources during initialization * acpi-resources: resource: Prevent irqresource_disabled() from erasing flags
Showing
- drivers/acpi/device_sysfs.c 2 additions, 2 deletionsdrivers/acpi/device_sysfs.c
- drivers/acpi/glue.c 4 additions, 4 deletionsdrivers/acpi/glue.c
- drivers/acpi/hed.c 0 additions, 1 deletiondrivers/acpi/hed.c
- drivers/acpi/internal.h 2 additions, 2 deletionsdrivers/acpi/internal.h
- drivers/acpi/power.c 3 additions, 13 deletionsdrivers/acpi/power.c
- drivers/acpi/scan.c 72 additions, 104 deletionsdrivers/acpi/scan.c
- drivers/acpi/sleep.h 0 additions, 1 deletiondrivers/acpi/sleep.h
- include/acpi/acpi_bus.h 5 additions, 0 deletionsinclude/acpi/acpi_bus.h
- include/linux/ioport.h 1 addition, 1 deletioninclude/linux/ioport.h
Loading
Please register or sign in to comment