git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[sfrench/cifs-2.6.git]
/
drivers
/
input
/
misc
/
max8997_haptic.c
diff --git
a/drivers/input/misc/max8997_haptic.c
b/drivers/input/misc/max8997_haptic.c
index 5b3154edf822bc808d769f52014a38e2d0a9cb07..d0f687281339b06d13122627406a3758c79d951f 100644
(file)
--- a/
drivers/input/misc/max8997_haptic.c
+++ b/
drivers/input/misc/max8997_haptic.c
@@
-378,8
+378,7
@@
static int max8997_haptic_remove(struct platform_device *pdev)
return 0;
}
return 0;
}
-#ifdef CONFIG_PM_SLEEP
-static int max8997_haptic_suspend(struct device *dev)
+static int __maybe_unused max8997_haptic_suspend(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
struct max8997_haptic *chip = platform_get_drvdata(pdev);
{
struct platform_device *pdev = to_platform_device(dev);
struct max8997_haptic *chip = platform_get_drvdata(pdev);
@@
-388,7
+387,6
@@
static int max8997_haptic_suspend(struct device *dev)
return 0;
}
return 0;
}
-#endif
static SIMPLE_DEV_PM_OPS(max8997_haptic_pm_ops, max8997_haptic_suspend, NULL);
static SIMPLE_DEV_PM_OPS(max8997_haptic_pm_ops, max8997_haptic_suspend, NULL);