diff options
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r-- | drivers/acpi/scan.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index 2f04cd1147e9..c548231965ef 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
@@ -1526,16 +1526,11 @@ static int acpi_bus_scan_fixed(struct acpi_device *root) | |||
1526 | return result; | 1526 | return result; |
1527 | } | 1527 | } |
1528 | 1528 | ||
1529 | 1529 | int __init acpi_scan_init(void) | |
1530 | static int __init acpi_scan_init(void) | ||
1531 | { | 1530 | { |
1532 | int result; | 1531 | int result; |
1533 | struct acpi_bus_ops ops; | 1532 | struct acpi_bus_ops ops; |
1534 | 1533 | ||
1535 | |||
1536 | if (acpi_disabled) | ||
1537 | return 0; | ||
1538 | |||
1539 | memset(&ops, 0, sizeof(ops)); | 1534 | memset(&ops, 0, sizeof(ops)); |
1540 | ops.acpi_op_add = 1; | 1535 | ops.acpi_op_add = 1; |
1541 | ops.acpi_op_start = 1; | 1536 | ops.acpi_op_start = 1; |
@@ -1568,5 +1563,3 @@ static int __init acpi_scan_init(void) | |||
1568 | Done: | 1563 | Done: |
1569 | return result; | 1564 | return result; |
1570 | } | 1565 | } |
1571 | |||
1572 | subsys_initcall(acpi_scan_init); | ||