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 /drivers/memory/emif.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 'drivers/memory/emif.h')
-rw-r--r-- | drivers/memory/emif.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/memory/emif.h b/drivers/memory/emif.h index 6b71fadb3cfa..55aeb36a5bf2 100644 --- a/drivers/memory/emif.h +++ b/drivers/memory/emif.h @@ -1,13 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ /* * Defines for the EMIF driver * * Copyright (C) 2012 Texas Instruments, Inc. * * Benoit Cousson (b-cousson@ti.com) - * - * 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. */ #ifndef __EMIF_H #define __EMIF_H |