diff --git a/[refs] b/[refs]
index 0d0be666500d..12ba9086e5cd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5db539e49fc7471e23bf3c94ca304f008cb7b7f3
+refs/heads/master: 30e695986679ac2d2354fc1634e8cb931bb47785
diff --git a/trunk/drivers/usb/gadget/net2280.c b/trunk/drivers/usb/gadget/net2280.c
index 234a1a97b84e..477fab2e74d1 100644
--- a/trunk/drivers/usb/gadget/net2280.c
+++ b/trunk/drivers/usb/gadget/net2280.c
@@ -1490,7 +1490,7 @@ show_registers (struct device *_dev, struct device_attribute *attr, char *buf)
 	unsigned long		flags;
 	int			i;
 	u32			t1, t2;
-	char			*s;
+	const char		*s;
 
 	dev = dev_get_drvdata (_dev);
 	next = buf;