diff --git a/[refs] b/[refs]
index 6119d981c61f..0f4c47f4f20c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bb730fda8aa4e3f7e94b259c468ecd095f60770
+refs/heads/master: bfd80223d73f80e1d1c69dace9151756b3ef3b49
diff --git a/trunk/drivers/acpi/button.c b/trunk/drivers/acpi/button.c
index 5ef885e82c78..7fda02c98310 100644
--- a/trunk/drivers/acpi/button.c
+++ b/trunk/drivers/acpi/button.c
@@ -74,7 +74,7 @@ static int acpi_button_state_open_fs(struct inode *inode, struct file *file);
 static struct acpi_driver acpi_button_driver = {
 	.name = ACPI_BUTTON_DRIVER_NAME,
 	.class = ACPI_BUTTON_CLASS,
-	.ids = "ACPI_FPB,ACPI_FSB,PNP0C0D,PNP0C0C,PNP0C0E",
+	.ids = "button_power,button_sleep,PNP0C0D,PNP0C0C,PNP0C0E",
 	.ops = {
 		.add = acpi_button_add,
 		.remove = acpi_button_remove,