Commit 36cb055f authored Jul 04, 2018 by Johan Hovold Committed by Greg Kroah-Hartman Jul 06, 2018

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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent d5b9653d

Documentation/devicetree/bindings/vendor-prefixes.txt.rej

deleted100644 → 0

+0 −10

Original line number	Diff line number	Diff line
		--- 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