diff --git a/[refs] b/[refs]
index 498431edf1dd..34e484fef191 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 58da495065134b45799bd02988ab658c3da6af25
+refs/heads/master: b299c22c8c1024a5a89d19524e24b3e1d67e9eab
diff --git a/trunk/drivers/acpi/ac.c b/trunk/drivers/acpi/ac.c
index 76b9bea98b6d..43a95e5640de 100644
--- a/trunk/drivers/acpi/ac.c
+++ b/trunk/drivers/acpi/ac.c
@@ -63,7 +63,7 @@ static int acpi_ac_add(struct acpi_device *device);
 static int acpi_ac_remove(struct acpi_device *device, int type);
 static int acpi_ac_resume(struct acpi_device *device);
 
-const static struct acpi_device_id ac_device_ids[] = {
+static const struct acpi_device_id ac_device_ids[] = {
 	{"ACPI0003", 0},
 	{"", 0},
 };