diff options
author | Len Brown <len.brown@intel.com> | 2008-10-22 23:27:59 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-10-22 23:27:59 -0400 |
commit | 0fbb3726f246aadd1bebc01114100b6e69afa5b9 (patch) | |
tree | 87e0ca2d5904df9e12e8b7b1d2b303b17758c70a /drivers/acpi/scan.c | |
parent | 47bf31adc541bef0c20de15e800e0011f1ae70c7 (diff) | |
parent | c0ff17720ec5f42205b3d2ca03a18da0a8272976 (diff) |
Merge branch 'ec' into test
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r-- | drivers/acpi/scan.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 3196749398ea..eae6c801536d 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -1565,7 +1565,6 @@ static int acpi_bus_scan_fixed(struct acpi_device *root) | |||
1565 | return result; | 1565 | return result; |
1566 | } | 1566 | } |
1567 | 1567 | ||
1568 | int __init acpi_boot_ec_enable(void); | ||
1569 | 1568 | ||
1570 | static int __init acpi_scan_init(void) | 1569 | static int __init acpi_scan_init(void) |
1571 | { | 1570 | { |
@@ -1599,9 +1598,6 @@ static int __init acpi_scan_init(void) | |||
1599 | */ | 1598 | */ |
1600 | result = acpi_bus_scan_fixed(acpi_root); | 1599 | result = acpi_bus_scan_fixed(acpi_root); |
1601 | 1600 | ||
1602 | /* EC region might be needed at bus_scan, so enable it now */ | ||
1603 | acpi_boot_ec_enable(); | ||
1604 | |||
1605 | if (!result) | 1601 | if (!result) |
1606 | result = acpi_bus_scan(acpi_root, &ops); | 1602 | result = acpi_bus_scan(acpi_root, &ops); |
1607 | 1603 | ||