diff options
| author | Greg Kroah-Hartman | 2016-06-20 17:25:44 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2016-06-20 17:25:44 +0200 |
| commit | af52739b922f656eb1f39016fabaabe4baeda2e2 (patch) | |
| tree | 79a7aa810d0493cd0cf4adebac26d37f12e8b545 /drivers/acpi/bus.c | |
| parent | staging/lustre: Update FID documentation link. (diff) | |
| parent | Linux 4.7-rc4 (diff) | |
| download | kernel-qcow2-linux-af52739b922f656eb1f39016fabaabe4baeda2e2.tar.gz kernel-qcow2-linux-af52739b922f656eb1f39016fabaabe4baeda2e2.tar.xz kernel-qcow2-linux-af52739b922f656eb1f39016fabaabe4baeda2e2.zip | |
Merge 4.7-rc4 into staging-next
We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/acpi/bus.c')
| -rw-r--r-- | drivers/acpi/bus.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 31e8da648fff..262ca31b86d9 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -1051,7 +1051,7 @@ static int __init acpi_bus_init(void) * Maybe EC region is required at bus_scan/acpi_get_devices. So it * is necessary to enable it as early as possible. */ - acpi_boot_ec_enable(); + acpi_ec_dsdt_probe(); printk(KERN_INFO PREFIX "Interpreter enabled\n"); |