Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 98f5d666 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "input: synaptics_dsx: support for pm ops"

parents 3384eda6 99de486f

drivers/input/touchscreen/synaptics_dsx/synaptics_dsx_core.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -4061,8 +4061,10 @@ static int synaptics_rmi4_resume(struct device *dev) 
}

}





static const struct dev_pm_ops synaptics_rmi4_dev_pm_ops = {

static const struct dev_pm_ops synaptics_rmi4_dev_pm_ops = {

#if (!defined(CONFIG_FB) && !defined(CONFIG_HAS_EARLYSUSPEND))

	.suspend = synaptics_rmi4_suspend,

	.suspend = synaptics_rmi4_suspend,

	.resume  = synaptics_rmi4_resume,

	.resume  = synaptics_rmi4_resume,

#endif

};

};

#else

#else

static int synaptics_rmi4_suspend(struct device *dev)

static int synaptics_rmi4_suspend(struct device *dev)