summaryrefslogtreecommitdiffstats
path: root/drivers/input/touchscreen
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2010-01-22 08:55:25 +0100
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2010-01-22 08:55:25 +0100
commit7755726fe90a8b253659756e6de68c1a55aa427f (patch)
treea3523fa77e07854db3b8089e3066a55ea997060c /drivers/input/touchscreen
parentInput: sh_keysc - add mode 4 and mode 5 support (diff)
parentLinux 2.6.33-rc5 (diff)
downloadlinux-7755726fe90a8b253659756e6de68c1a55aa427f.tar.xz
linux-7755726fe90a8b253659756e6de68c1a55aa427f.zip
Merge commit 'v2.6.33-rc5' into next
Diffstat (limited to 'drivers/input/touchscreen')
-rw-r--r--drivers/input/touchscreen/pcap_ts.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/touchscreen/pcap_ts.c b/drivers/input/touchscreen/pcap_ts.c
index 67fcd33595de..b79097e3028a 100644
--- a/drivers/input/touchscreen/pcap_ts.c
+++ b/drivers/input/touchscreen/pcap_ts.c
@@ -233,7 +233,7 @@ static int pcap_ts_resume(struct device *dev)
return 0;
}
-static struct dev_pm_ops pcap_ts_pm_ops = {
+static const struct dev_pm_ops pcap_ts_pm_ops = {
.suspend = pcap_ts_suspend,
.resume = pcap_ts_resume,
};