diff --git a/[refs] b/[refs]
index d1695b72b6b6..b08e87ffa195 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 466e78f779b2b811f77dbd2ebf618ddd42e3ed50
+refs/heads/master: d8014c4b28d725acdbdbe6969887bad03bf1084a
diff --git a/trunk/drivers/acpi/fan.c b/trunk/drivers/acpi/fan.c
index bc36a476f1ab..3bd6a54702d6 100644
--- a/trunk/drivers/acpi/fan.c
+++ b/trunk/drivers/acpi/fan.c
@@ -212,24 +212,4 @@ static int acpi_fan_resume(struct device *dev)
 }
 #endif
 
-static int __init acpi_fan_init(void)
-{
-	int result = 0;
-
-	result = acpi_bus_register_driver(&acpi_fan_driver);
-	if (result < 0)
-		return -ENODEV;
-
-	return 0;
-}
-
-static void __exit acpi_fan_exit(void)
-{
-
-	acpi_bus_unregister_driver(&acpi_fan_driver);
-
-	return;
-}
-
-module_init(acpi_fan_init);
-module_exit(acpi_fan_exit);
+module_acpi_driver(acpi_fan_driver);