diff options
author | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2020-04-16 14:35:16 +0300 |
---|---|---|
committer | Joonas Lahtinen <joonas.lahtinen@linux.intel.com> | 2020-04-16 14:35:16 +0300 |
commit | 2b703bbda2713fd2a7d98029ea6c44f9c3159f34 (patch) | |
tree | 00aabbb35186a4541ccccf89dead04e251d0541d /Documentation/devicetree/bindings/watchdog/st,stpmic1-wdt.txt | |
parent | 3ffaf56e912e76cf09c560244c8804f9bebda8b1 (diff) | |
parent | 8f3d9f354286745c751374f5f1fcafee6b3f3136 (diff) | |
download | linux-2b703bbda2713fd2a7d98029ea6c44f9c3159f34.tar.xz |
Merge drm/drm-next into drm-intel-next-queued
Backmerging in order to pull "topic/phy-compliance".
Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Diffstat (limited to 'Documentation/devicetree/bindings/watchdog/st,stpmic1-wdt.txt')
-rw-r--r-- | Documentation/devicetree/bindings/watchdog/st,stpmic1-wdt.txt | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/Documentation/devicetree/bindings/watchdog/st,stpmic1-wdt.txt b/Documentation/devicetree/bindings/watchdog/st,stpmic1-wdt.txt deleted file mode 100644 index 7cc1407f15cb..000000000000 --- a/Documentation/devicetree/bindings/watchdog/st,stpmic1-wdt.txt +++ /dev/null @@ -1,11 +0,0 @@ -STMicroelectronics STPMIC1 Watchdog - -Required properties: - -- compatible : should be "st,stpmic1-wdt" - -Example: - -watchdog { - compatible = "st,stpmic1-wdt"; -}; |