redonkable/freescale-linux-fslc
redonkable/freescale-linux-fslc
1
0
Fork 0
Code Releases Activity

dt-bindings: vendor-prefixes: fix bad merge

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

Fixes: 176193b7dd ("dt-bindings: gnss: add sirfstar binding")
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Johan Hovold 2018-07-04 08:46:26 +02:00 committed by Greg Kroah-Hartman
parent d5b9653dd2
commit 36cb055f1b
1 changed files with 0 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Documentation/devicetree/bindings/vendor-prefixes.txt.rej
View file

@ -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