diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-02 01:20:58 +0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-02 01:20:58 +0400 |
| commit | dde3ada3d0069855eeb353707b2b0f946191cfd6 (patch) | |
| tree | bdc2d358f8dc7fc29000149ebc4db949934b15b2 /drivers/input/touchscreen | |
| parent | 5e056ef4ddeb6129f6bb170f2c26b8f370bbcda7 (diff) | |
| parent | fb4f552e895cec29934d94a99cbd1f1f00448a88 (diff) | |
| download | linux-dde3ada3d0069855eeb353707b2b0f946191cfd6.tar.xz | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.7 merge window.
Diffstat (limited to 'drivers/input/touchscreen')
| -rw-r--r-- | drivers/input/touchscreen/s3c2410_ts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/s3c2410_ts.c b/drivers/input/touchscreen/s3c2410_ts.c index bf1a06400067..b3c66d4d02f6 100644 --- a/drivers/input/touchscreen/s3c2410_ts.c +++ b/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, }; |