diff options
author | Len Brown <len.brown@intel.com> | 2009-04-05 01:38:31 -0400 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2009-04-05 01:38:31 -0400 |
commit | 9a38f4eec57cc5104b6a85bc6d0a91b268fbe803 (patch) | |
tree | da01b5dd92d4076878003a8886fc2c9265e578f5 /drivers/acpi/scan.c | |
parent | 67dc092187626ac55a60877485f78bc291cbfa81 (diff) | |
parent | 018f452e9d9d0cb5c3e8d33fd94dc6cd3c520a8f (diff) |
Merge branch 'bjorn-initcall-cleanup' into release
Diffstat (limited to 'drivers/acpi/scan.c')
-rw-r--r-- | drivers/acpi/scan.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index c54d7b6c406..c548231965e 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c @@ -11,6 +11,8 @@ #include <acpi/acpi_drivers.h> +#include "internal.h" + #define _COMPONENT ACPI_BUS_COMPONENT ACPI_MODULE_NAME("scan"); #define STRUCT_TO_INT(s) (*((int*)&s)) @@ -1524,16 +1526,11 @@ static int acpi_bus_scan_fixed(struct acpi_device *root) return result; } - -static int __init acpi_scan_init(void) +int __init acpi_scan_init(void) { int result; struct acpi_bus_ops ops; - - if (acpi_disabled) - return 0; - memset(&ops, 0, sizeof(ops)); ops.acpi_op_add = 1; ops.acpi_op_start = 1; @@ -1566,5 +1563,3 @@ static int __init acpi_scan_init(void) Done: return result; } - -subsys_initcall(acpi_scan_init); |