diff --git a/[refs] b/[refs]
index f58b1648b547..2b08ee6aeac4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31b95bfb79e8d7637ba0d399eb152f9b0d548340
+refs/heads/master: bd68dfe0071b50bc69416a92ee22b63d1cc33a3b
diff --git a/trunk/drivers/input/touchscreen/s3c2410_ts.c b/trunk/drivers/input/touchscreen/s3c2410_ts.c
index bf1a06400067..b3c66d4d02f6 100644
--- a/trunk/drivers/input/touchscreen/s3c2410_ts.c
+++ b/trunk/drivers/input/touchscreen/s3c2410_ts.c
@@ -406,7 +406,7 @@ static int s3c2410ts_resume(struct device *dev)
 	return 0;
 }
 
-static struct dev_pm_ops s3c_ts_pmops = {
+static const struct dev_pm_ops s3c_ts_pmops = {
 	.suspend	= s3c2410ts_suspend,
 	.resume		= s3c2410ts_resume,
 };