[src/trunk]: src/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl Fix m...

[kre <kre%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/4d82c9ea070f
branches:  trunk
changeset: 447876:4d82c9ea070f
user:      kre <kre%NetBSD.org@localhost>
date:      Sun Jan 27 05:07:46 2019 +0000

description:
Fix merge botch

diffstat:

 sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h |  8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diffs (15 lines):

diff -r f5c73e4246e1 -r 4d82c9ea070f sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h
--- a/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h    Sun Jan 27 05:06:35 2019 +0000
+++ b/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h    Sun Jan 27 05:07:46 2019 +0000
@@ -1,10 +1,4 @@
-/*     $NetBSD: stm32-pinfunc.h,v 1.2 2019/01/27 02:08:43 pgoyette Exp $       */
-
-/* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
-/*
- * Copyright (C) STMicroelectronics 2017 - All Rights Reserved
- * Author: Torgue Alexandre <alexandre.torgue%st.com@localhost> for STMicroelectronics.
- */
+/*     $NetBSD: stm32-pinfunc.h,v 1.3 2019/01/27 05:07:46 kre Exp $    */
 
 /* SPDX-License-Identifier: (GPL-2.0+ OR BSD-3-Clause) */
 /*