From 0abcbaa9c6681966f377cdf79878b4d23fad65c3 Mon Sep 17 00:00:00 2001 From: kre Date: Sun, 27 Jan 2019 05:07:46 +0000 Subject: [PATCH] Fix merge botch --- .../dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h b/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h index a534190f2783..41d61ee4b019 100644 --- a/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h +++ b/sys/external/gpl2/dts/dist/include/dt-bindings/pinctrl/stm32-pinfunc.h @@ -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 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) */ /*