projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[deliverable/linux.git]
/
drivers
/
input
/
touchscreen
/
ucb1400_ts.c
diff --git
a/drivers/input/touchscreen/ucb1400_ts.c
b/drivers/input/touchscreen/ucb1400_ts.c
index f100c7f4c1dbf2ea72ad771f0775e39d666dd3ed..6954f55001080d29b337a37c9398b6c8f867ec1a 100644
(file)
--- a/
drivers/input/touchscreen/ucb1400_ts.c
+++ b/
drivers/input/touchscreen/ucb1400_ts.c
@@
-419,7
+419,7
@@
static int ucb1400_ts_remove(struct platform_device *dev)
#ifdef CONFIG_PM
static int ucb1400_ts_resume(struct platform_device *dev)
{
- struct ucb1400_ts *ucb =
platform_get_drvdata(dev)
;
+ struct ucb1400_ts *ucb =
dev->dev.platform_data
;
if (ucb->ts_task) {
/*
This page took
0.026758 seconds
and
5
git commands to generate.