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/arm/mach-pxa/pm.h | |
| 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/arm/mach-pxa/pm.h')
| -rw-r--r-- | arch/arm/mach-pxa/pm.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-pxa/pm.h b/arch/arm/mach-pxa/pm.h index 3aab90d8d2b7..00ea3529e30e 100644 --- a/arch/arm/mach-pxa/pm.h +++ b/arch/arm/mach-pxa/pm.h @@ -1,10 +1,6 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Copyright (c) 2005 Richard Purdie - * - * 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/suspend.h> |