diff --git a/[refs] b/[refs]
index b5643a62cf50..33e5d1279f31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cbfa6f2a684e9fb7d6a5025b3893b8f93112683c
+refs/heads/master: f7e8dd5071340541587e588c8fb4404dd5b0462d
diff --git a/trunk/drivers/misc/intel_menlow.c b/trunk/drivers/misc/intel_menlow.c
index de16e88eb8d3..0c0bb3093e07 100644
--- a/trunk/drivers/misc/intel_menlow.c
+++ b/trunk/drivers/misc/intel_menlow.c
@@ -213,7 +213,7 @@ static int intel_menlow_memory_remove(struct acpi_device *device, int type)
 	return 0;
 }
 
-const static struct acpi_device_id intel_menlow_memory_ids[] = {
+static const struct acpi_device_id intel_menlow_memory_ids[] = {
 	{"INT0002", 0},
 	{"", 0},
 };