diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
commit | f05c02032c007399078784ea2ace322385f869b9 (patch) | |
tree | 7c1bd28f37be1d28a3c8ace051c55472ba8bdd63 /0001-Revert-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch | |
parent | 55576abe986db86a9f4e2b105d2451800d652217 (diff) | |
parent | f7a3bf654752fa0e92c7ab3e57e48d3415632852 (diff) | |
download | kernel-f05c02032c007399078784ea2ace322385f869b9.tar.gz kernel-f05c02032c007399078784ea2ace322385f869b9.tar.xz kernel-f05c02032c007399078784ea2ace322385f869b9.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat (limited to '0001-Revert-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch')
-rw-r--r-- | 0001-Revert-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/0001-Revert-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch b/0001-Revert-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch deleted file mode 100644 index 6dd594d45..000000000 --- a/0001-Revert-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Peter Robinson <pbrobinson@gmail.com> -Date: Sun, 12 Jul 2020 13:39:32 +0100 -Subject: [PATCH] Revert "dt-bindings: Add doc for Pine64 Pinebook Pro" - -This reverts commit ec0f66d2bc5ffd2a06eaf254ad314153e557cb7c. - -This is already upstream and not sure why it still applies but we -don't need it any more. ---- - Documentation/devicetree/bindings/arm/rockchip.yaml | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml -index ed808148b6a7..d4a4045092df 100644 ---- a/Documentation/devicetree/bindings/arm/rockchip.yaml -+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml -@@ -425,11 +425,6 @@ properties: - - const: pine64,rockpro64 - - const: rockchip,rk3399 - -- - description: Pine64 PinebookPro -- items: -- - const: pine64,pinebook-pro -- - const: rockchip,rk3399 -- - - description: Radxa Rock - items: - - const: radxa,rock --- -2.26.2 - |