diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-03 16:45:11 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-03 16:45:11 +0200 |
| commit | 76aaf5ee07624bd9dbdc426e38a4059bf56f52e5 (patch) | |
| tree | 9392ac81841d28a8f5fd07814de421fbb772df56 /0001-Revert-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch | |
| parent | d5f831500b4b36dba3f9bae6e8ac14266b495790 (diff) | |
| parent | 4403d9295a23adb83010ef08e1d4bbf481057131 (diff) | |
| download | kernel-5.8.0-1.vanilla.1.fc31.tar.gz kernel-5.8.0-1.vanilla.1.fc31.tar.xz kernel-5.8.0-1.vanilla.1.fc31.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-1.vanilla.1.fc33kernel-5.8.0-1.vanilla.1.fc32kernel-5.8.0-1.vanilla.1.fc31
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, 32 insertions, 0 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 new file mode 100644 index 000000000..6dd594d45 --- /dev/null +++ b/0001-Revert-dt-bindings-Add-doc-for-Pine64-Pinebook-Pro.patch @@ -0,0 +1,32 @@ +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 + |