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/ec.c | |
| parent | 67dc092187626ac55a60877485f78bc291cbfa81 (diff) | |
| parent | 018f452e9d9d0cb5c3e8d33fd94dc6cd3c520a8f (diff) | |
Merge branch 'bjorn-initcall-cleanup' into release
Diffstat (limited to 'drivers/acpi/ec.c')
| -rw-r--r-- | drivers/acpi/ec.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index 2fe15060dcd..bf88f180380 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c @@ -1069,13 +1069,10 @@ static struct acpi_driver acpi_ec_driver = { }, }; -static int __init acpi_ec_init(void) +int __init acpi_ec_init(void) { int result = 0; - if (acpi_disabled) - return 0; - acpi_ec_dir = proc_mkdir(ACPI_EC_CLASS, acpi_root_dir); if (!acpi_ec_dir) return -ENODEV; @@ -1090,8 +1087,6 @@ static int __init acpi_ec_init(void) return result; } -subsys_initcall(acpi_ec_init); - /* EC driver currently not unloadable */ #if 0 static void __exit acpi_ec_exit(void) |