diff options
| author |   Olof Johansson <olof@lixom.net> | 2019-07-02 15:13:20 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2019-07-02 15:13:20 -0700 |
| commit | 2659dc8d225c956b91d8a8e4ef05d91b2e985c02 (patch) | |
| tree | 5cb6e035b6f154668f4f144b66ccc825a0c73df5 /arch/mips/kernel/perf_event.c | |
| parent | soc: ti: fix irq-ti-sci link error (diff) | |
| parent | ARM: davinci: da830-evm: fix GPIO lookup for OHCI (diff) | |
| download | linux-dev-2659dc8d225c956b91d8a8e4ef05d91b2e985c02.tar.xz linux-dev-2659dc8d225c956b91d8a8e4ef05d91b2e985c02.zip | |
Merge tag 'davinci-fixes-for-v5.2-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into arm/fixes
This set of patches fixes regressions introduced in v5.2 kernel when DA8xx
OHCI driver was converted over to use GPIO regulators.
* tag 'davinci-fixes-for-v5.2-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci:
ARM: davinci: da830-evm: fix GPIO lookup for OHCI
ARM: davinci: omapl138-hawk: add missing regulator constraints for OHCI
ARM: davinci: da830-evm: add missing regulator constraints for OHCI
+ Linux 5.2-rc7
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/mips/kernel/perf_event.c')
| -rw-r--r-- | arch/mips/kernel/perf_event.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/mips/kernel/perf_event.c b/arch/mips/kernel/perf_event.c index f298eb2ff6c2..5d7a9c03903b 100644 --- a/arch/mips/kernel/perf_event.c +++ b/arch/mips/kernel/perf_event.c @@ -1,3 +1,4 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * Linux performance counter support for MIPS. * @@ -8,10 +9,6 @@ * based on the sparc64 perf event code and the x86 code. Performance * counter access is based on the MIPS Oprofile code. And the callchain * support references the code of MIPS stacktrace.c. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. */ #include <linux/perf_event.h> |