diff options
| author | Mark Brown <broonie@kernel.org> | 2019-06-18 14:12:47 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2019-06-18 14:12:47 -0400 |
| commit | e1d700f7c94e755106749411706a38e39a93404b (patch) | |
| tree | b1230cb7eba5a4ef28ed2cd2527d9ac78f06cc00 /include/linux/mfd/da9063 | |
| parent | ba576a6232dc06605f4edfaeea9b526ba7724f84 (diff) | |
| parent | d1fdb6d8f6a4109a4263176c84b899076a5f8008 (diff) | |
Merge tag 'v5.2-rc4' into regulator-5.3
Linux 5.2-rc4
Diffstat (limited to 'include/linux/mfd/da9063')
| -rw-r--r-- | include/linux/mfd/da9063/pdata.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/linux/mfd/da9063/pdata.h b/include/linux/mfd/da9063/pdata.h index 21a2d107f0cf..085edbf7601b 100644 --- a/include/linux/mfd/da9063/pdata.h +++ b/include/linux/mfd/da9063/pdata.h | |||
| @@ -1,3 +1,4 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0-or-later */ | ||
| 1 | /* | 2 | /* |
| 2 | * Platform configuration options for DA9063 | 3 | * Platform configuration options for DA9063 |
| 3 | * | 4 | * |
| @@ -5,12 +6,6 @@ | |||
| 5 | * | 6 | * |
| 6 | * Author: Michal Hajduk, Dialog Semiconductor | 7 | * Author: Michal Hajduk, Dialog Semiconductor |
| 7 | * Author: Krystian Garbaciak, Dialog Semiconductor | 8 | * Author: Krystian Garbaciak, Dialog Semiconductor |
| 8 | * | ||
| 9 | * This program is free software; you can redistribute it and/or modify it | ||
| 10 | * under the terms of the GNU General Public License as published by the | ||
| 11 | * Free Software Foundation; either version 2 of the License, or (at your | ||
| 12 | * option) any later version. | ||
| 13 | * | ||
| 14 | */ | 9 | */ |
| 15 | 10 | ||
| 16 | #ifndef __MFD_DA9063_PDATA_H__ | 11 | #ifndef __MFD_DA9063_PDATA_H__ |