diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-08 21:29:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-04-08 21:29:10 -0700 |
| commit | 5602b0af9df02783df0e8fd9afc5dcadd38a3271 (patch) | |
| tree | 79c73b3042b300aedcd231b16f7cb47a2eb8d789 /include | |
| parent | 413a103cf6e507f6304ec42b89ed45428942c43f (diff) | |
| parent | 2d63908bdbfbce0d98195b22236ad5105dc6eba2 (diff) | |
| download | linux-stable-5602b0af9df02783df0e8fd9afc5dcadd38a3271.tar.gz linux-stable-5602b0af9df02783df0e8fd9afc5dcadd38a3271.tar.bz2 linux-stable-5602b0af9df02783df0e8fd9afc5dcadd38a3271.zip | |
Merge tag 'linux-watchdog-5.7-rc1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck:
- add TI K3 RTI watchdog
- add stop_on_reboot parameter to control reboot policy
- wm831x_wdt: Remove GPIO handling
- several small fixes, improvements and clean-ups
* tag 'linux-watchdog-5.7-rc1' of git://www.linux-watchdog.org/linux-watchdog:
watchdog: Add K3 RTI watchdog support
dt-bindings: watchdog: Add support for TI K3 RTI watchdog
watchdog: ziirave_wdt: change name to be more specific
watchdog: orion: use 0 for unset heartbeat
watchdog: npcm: remove whitespaces
watchdog: reset last_hw_keepalive time at start
watchdog: imx2_wdt: Drop .remove callback
watchdog: Add stop_on_reboot parameter to control reboot policy
watchdog: wm831x_wdt: Remove GPIO handling
watchdog: imx7ulp: Remove unused include of init.h
watchdog: imx_sc_wdt: Remove unused includes
watchdog: qcom: Use irq flags from firmware
watchdog: pm8916_wdt: Add system sleep callbacks
watchdog: qcom-wdt: disable pretimeout on timer platform
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mfd/wm831x/pdata.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/mfd/wm831x/pdata.h b/include/linux/mfd/wm831x/pdata.h index 986986fe4e4e..75aa94dadf1c 100644 --- a/include/linux/mfd/wm831x/pdata.h +++ b/include/linux/mfd/wm831x/pdata.h @@ -89,7 +89,6 @@ enum wm831x_watchdog_action { struct wm831x_watchdog_pdata { enum wm831x_watchdog_action primary, secondary; - int update_gpio; unsigned int software:1; }; |