diff --git a/[refs] b/[refs]
index e15fc2d34c42..4ac39876abe6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 653a00c9662304ef72a3eb4e681c91720960e0b4
+refs/heads/master: 3c602840528cf1aa835e6e32d76a0a45936b8e4c
diff --git a/trunk/drivers/acpi/fan.c b/trunk/drivers/acpi/fan.c
index f6e8165c32e8..48cb705b274a 100644
--- a/trunk/drivers/acpi/fan.c
+++ b/trunk/drivers/acpi/fan.c
@@ -337,10 +337,12 @@ 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)
 		return -ENODEV;
 	acpi_fan_dir->owner = THIS_MODULE;
+#endif
 
 	result = acpi_bus_register_driver(&acpi_fan_driver);
 	if (result < 0) {