apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ec' into test

Browse Source
This commit is contained in:
Len Brown
2008-10-22 23:27:59 -04:00
parent 47bf31adc5 c0ff17720e
commit 0fbb3726f2
4 changed files with 204 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/acpi/bus.c
+6
View File
@@ -793,6 +793,12 @@ static int __init acpi_bus_init(void)
goto error1;
}
/*
* 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();
printk(KERN_INFO PREFIX "Interpreter enabled\n");
/* Initialize sleep structures */
drivers/acpi/ec.c
+197 -189
View File
File diff suppressed because it is too large Load Diff
drivers/acpi/scan.c
-4
View File
@@ -1565,7 +1565,6 @@ static int acpi_bus_scan_fixed(struct acpi_device *root)
return result;
}
int __init acpi_boot_ec_enable(void);
static int __init acpi_scan_init(void)
{
@@ -1599,9 +1598,6 @@ static int __init acpi_scan_init(void)
*/
result = acpi_bus_scan_fixed(acpi_root);
/* EC region might be needed at bus_scan, so enable it now */
acpi_boot_ec_enable();
if (!result)
result = acpi_bus_scan(acpi_root, &ops);
include/acpi/acpi_drivers.h
+1
View File
@@ -101,6 +101,7 @@ extern int acpi_power_nocheck;
-------------------------------------------------------------------------- */
#ifdef CONFIG_ACPI_EC
int acpi_ec_ecdt_probe(void);
int acpi_boot_ec_enable(void);
#endif
/* --------------------------------------------------------------------------