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

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

Merge "msm: watchdog: Add hibernation support"

parents d00ab816 4b5f10b9

drivers/soc/qcom/watchdog_v2.c

+2 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -873,8 +873,7 @@ err: 
}



static const struct dev_pm_ops msm_watchdog_dev_pm_ops = {

	.suspend_noirq = msm_watchdog_suspend,

	.resume_noirq = msm_watchdog_resume,

	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(msm_watchdog_suspend, msm_watchdog_resume)

};



static struct platform_driver msm_watchdog_driver = {