Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[oweals/u-boot.git] / arch / arm / include / asm / arch-exynos / pwm.h

diff --git a/arch/arm/include/asm/arch-exynos/pwm.h b/arch/arm/include/asm/arch-exynos/pwm.h
index d0cf3cb853b84b4fab122752fad43ac8c53f2605..43474c34b0c5d854a6ab633018c2fe54e8da0012 100644 (file)
--- a/arch/arm/include/asm/arch-exynos/pwm.h
+++ b/arch/arm/include/asm/arch-exynos/pwm.h
@@ -3,20 +3,7 @@
  * Kyungmin Park <kyungmin.park@samsung.com>
  * Minkyu Kang <mk7.kang@samsung.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __ASM_ARM_ARCH_PWM_H_
@@ -57,7 +44,7 @@ struct s5p_timer {
        unsigned int    tcmpb2;
        unsigned int    tcnto2;
        unsigned int    tcntb3;
-       unsigned int    res1;
+       unsigned int    tcmpb3;
        unsigned int    tcnto3;
        unsigned int    tcntb4;
        unsigned int    tcnto4;