diff --git a/[refs] b/[refs]
index dc2b0cb0c099..8e9da0976c3c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a9844b18502bde376284e4ad83b04fa20eb5afa5
+refs/heads/master: 35c4b918a696f20cb775f1a65955c8ed0fe7c052
diff --git a/trunk/drivers/input/gameport/ns558.c b/trunk/drivers/input/gameport/ns558.c
index db556b71ddda..7c217848613e 100644
--- a/trunk/drivers/input/gameport/ns558.c
+++ b/trunk/drivers/input/gameport/ns558.c
@@ -166,7 +166,7 @@ static int ns558_isa_probe(int io)
 
 #ifdef CONFIG_PNP
 
-static struct pnp_device_id pnp_devids[] = {
+static const struct pnp_device_id pnp_devids[] = {
 	{ .id = "@P@0001", .driver_data = 0 }, /* ALS 100 */
 	{ .id = "@P@0020", .driver_data = 0 }, /* ALS 200 */
 	{ .id = "@P@1001", .driver_data = 0 }, /* ALS 100+ */