diff options
| author | Johan Hovold <johan@kernel.org> | 2018-07-04 09:46:26 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-07-06 17:48:15 +0300 |
| commit | 36cb055f1bcfd10e4565867a696ff688d9de3cf4 (patch) | |
| tree | 7ae06ed912bca284076ef7e616928d16a9b4a2db /Documentation/devicetree | |
| parent | d5b9653dd2bb7a2b1c8cc783c5d3b607bbb6b271 (diff) | |
| download | linux-36cb055f1bcfd10e4565867a696ff688d9de3cf4.tar.xz | |
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 a593bff82cae2 ("dt-bindings: define vendor prefix for
Wi2Wi, Inc.").
Fixes: 176193b7dd6e ("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>
Diffstat (limited to 'Documentation/devicetree')
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt.rej | 10 |
1 files changed, 0 insertions, 10 deletions
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 |