diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-06-24 13:19:53 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-06-24 13:19:53 -0400 |
| commit | d2abae71ebcc409828b24ce9da402548ecdf1311 (patch) | |
| tree | 5edfafc2828d3bcebb3698520ccba374cd4328c0 /drivers/pwm/pwm-omap-dmtimer.c | |
| parent | 66567fcbaecac455caa1b13643155d686b51ce63 (diff) | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
Merge tag 'v5.2-rc6' into sched/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/pwm/pwm-omap-dmtimer.c')
| -rw-r--r-- | drivers/pwm/pwm-omap-dmtimer.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/pwm/pwm-omap-dmtimer.c b/drivers/pwm/pwm-omap-dmtimer.c index f45798679e3c..00772fc53490 100644 --- a/drivers/pwm/pwm-omap-dmtimer.c +++ b/drivers/pwm/pwm-omap-dmtimer.c | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | // SPDX-License-Identifier: GPL-2.0-only | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (c) 2015 Neil Armstrong <narmstrong@baylibre.com> | 3 | * Copyright (c) 2015 Neil Armstrong <narmstrong@baylibre.com> |
| 3 | * Copyright (c) 2014 Joachim Eastwood <manabian@gmail.com> | 4 | * Copyright (c) 2014 Joachim Eastwood <manabian@gmail.com> |
| @@ -7,10 +8,6 @@ | |||
| 7 | * | 8 | * |
| 8 | * Also based on pwm-samsung.c | 9 | * Also based on pwm-samsung.c |
| 9 | * | 10 | * |
| 10 | * This program is free software; you can redistribute it and/or | ||
| 11 | * modify it under the terms of the GNU General Public License | ||
| 12 | * version 2 as published by the Free Software Foundation. | ||
| 13 | * | ||
| 14 | * Description: | 11 | * Description: |
| 15 | * This file is the core OMAP support for the generic, Linux | 12 | * This file is the core OMAP support for the generic, Linux |
| 16 | * PWM driver / controller, using the OMAP's dual-mode timers. | 13 | * PWM driver / controller, using the OMAP's dual-mode timers. |