Remove the vendor-prefix reject file which was accidentally added when
merging the gnss sirfstar binding. The wi2wi prefix had already been
added by commit a593bff82cae2 ("dt-bindings: define vendor prefix for
Wi2Wi, Inc.").
Fixes: 176193b7dd6e ("dt-bindings: gnss: add sirfstar binding")
Reported-by: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Johan Hovold <jo...@kernel.org>
---
This applies to the char-misc tree.
.../devicetree/bindings/vendor-prefixes.txt.rej | 10 ----------
1 file changed, 10 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/vendor-prefixes.txt.rej
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt.rej
b/Documentation/devicetree/bindings/vendor-prefixes.txt.rej
deleted file mode 100644
index a32acd9ce2b2..000000000000
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt.rej
+++ /dev/null
@@ -1,10 +0,0 @@
---- Documentation/devicetree/bindings/vendor-prefixes.txt
-+++ Documentation/devicetree/bindings/vendor-prefixes.txt
-@@ -395,6 +397,7 @@ vot Vision Optical Technology Co., Ltd.
- wd Western Digital Corp.
- wetek WeTek Electronics, limited.
- wexler Wexler
-+wi2wi Wi2Wi, Inc.
- winbond Winbond Electronics corp.
- winstar Winstar Display Corp.
- wlf Wolfson Microelectronics
--
2.18.0
