diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-08 04:58:55 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-08 04:58:55 -0400 |
| commit | 552dc340bce3b28f4af33c9134adafa5efacf1c9 (patch) | |
| tree | 8ec5d6d4f7462e92baa0732aa2c47cc33a0b851c /drivers/acpi/fan.c | |
| parent | a9fda02bfc91a281cd812ae15dabe6bfb9574f90 (diff) | |
| parent | ee621dd619b9a85eced150fc06e352fef54cfda0 (diff) | |
Merge branch 'for_rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
Diffstat (limited to 'drivers/acpi/fan.c')
| -rw-r--r-- | drivers/acpi/fan.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/acpi/fan.c b/drivers/acpi/fan.c index 8a3b840c0bb2..d94d2953c974 100644 --- a/drivers/acpi/fan.c +++ b/drivers/acpi/fan.c | |||
| @@ -369,7 +369,9 @@ static void __exit acpi_fan_exit(void) | |||
| 369 | 369 | ||
| 370 | acpi_bus_unregister_driver(&acpi_fan_driver); | 370 | acpi_bus_unregister_driver(&acpi_fan_driver); |
| 371 | 371 | ||
| 372 | #ifdef CONFIG_ACPI_PROCFS | ||
| 372 | remove_proc_entry(ACPI_FAN_CLASS, acpi_root_dir); | 373 | remove_proc_entry(ACPI_FAN_CLASS, acpi_root_dir); |
| 374 | #endif | ||
| 373 | 375 | ||
| 374 | return; | 376 | return; |
| 375 | } | 377 | } |