From 32231e0d851d05812cb45f0e8637ff9b7a15cdc2 Mon Sep 17 00:00:00 2001
From: Mika Westerberg <mika.westerberg@linux.intel.com>
Date: Fri, 7 Sep 2012 10:31:39 +0300
Subject: [PATCH] --- yaml --- r: 331729 b: refs/heads/master c:
 466e78f779b2b811f77dbd2ebf618ddd42e3ed50 h: refs/heads/master i:   331727:
 dc277e452e24ec2402523f6c6f8104ca8a92e5de v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/acpi/button.c | 13 +------------
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 47dc5ffca65c..d1695b72b6b6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d2cf8f5aab358c897902ebad40fa4edd1b4556e
+refs/heads/master: 466e78f779b2b811f77dbd2ebf618ddd42e3ed50
diff --git a/trunk/drivers/acpi/button.c b/trunk/drivers/acpi/button.c
index 314a3b84bbc7..f0d936b65e37 100644
--- a/trunk/drivers/acpi/button.c
+++ b/trunk/drivers/acpi/button.c
@@ -450,15 +450,4 @@ static int acpi_button_remove(struct acpi_device *device, int type)
 	return 0;
 }
 
-static int __init acpi_button_init(void)
-{
-	return acpi_bus_register_driver(&acpi_button_driver);
-}
-
-static void __exit acpi_button_exit(void)
-{
-	acpi_bus_unregister_driver(&acpi_button_driver);
-}
-
-module_init(acpi_button_init);
-module_exit(acpi_button_exit);
+module_acpi_driver(acpi_button_driver);