diff --git a/[refs] b/[refs] index 3ff1077dd404..1b3b5d769011 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 75cbfb97a156dd3dabdc81295fb8144576332366 +refs/heads/master: 934231de706d2579fae14f5857fcd8de991009ff diff --git a/trunk/drivers/acpi/fan.c b/trunk/drivers/acpi/fan.c index acf2ab249842..8a3b840c0bb2 100644 --- a/trunk/drivers/acpi/fan.c +++ b/trunk/drivers/acpi/fan.c @@ -347,7 +347,6 @@ static int __init acpi_fan_init(void) { int result = 0; - #ifdef CONFIG_ACPI_PROCFS acpi_fan_dir = proc_mkdir(ACPI_FAN_CLASS, acpi_root_dir); if (!acpi_fan_dir) @@ -356,7 +355,9 @@ static int __init acpi_fan_init(void) result = acpi_bus_register_driver(&acpi_fan_driver); if (result < 0) { +#ifdef CONFIG_ACPI_PROCFS remove_proc_entry(ACPI_FAN_CLASS, acpi_root_dir); +#endif return -ENODEV; }