diff --git a/[refs] b/[refs]
index 33e5d1279f31..bb4107764c76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f7e8dd5071340541587e588c8fb4404dd5b0462d
+refs/heads/master: b0cdb5e11800dd76d9bb69aa335c8a33ddc50f5a
diff --git a/trunk/drivers/char/sonypi.c b/trunk/drivers/char/sonypi.c
index 921c6d2bc8fc..c03ad164c39a 100644
--- a/trunk/drivers/char/sonypi.c
+++ b/trunk/drivers/char/sonypi.c
@@ -1147,7 +1147,7 @@ static int sonypi_acpi_remove(struct acpi_device *device, int type)
 	return 0;
 }
 
-const static struct acpi_device_id sonypi_device_ids[] = {
+static const struct acpi_device_id sonypi_device_ids[] = {
 	{"SNY6001", 0},
 	{"", 0},
 };