Commit 36cb055f authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

dt-bindings: vendor-prefixes: fix bad merge

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 a593bff8 ("dt-bindings: define vendor prefix for
Wi2Wi, Inc.").

Fixes: 176193b7 ("dt-bindings: gnss: add sirfstar binding")
Reported-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d5b9653d
--- 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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment