diff options
| author | Joerg Roedel <jroedel@suse.de> | 2019-06-24 04:23:16 -0400 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2019-06-24 04:23:16 -0400 |
| commit | ceedd5f74d8cfe34db4e654a7808e3c5de40d6f5 (patch) | |
| tree | e19c18292231202e9cd8d484ee43f46b2c9c9ad1 /include/linux/platform_data/dmtimer-omap.h | |
| parent | 1b961423158caaae49d3900b7c9c37477bbfa9b3 (diff) | |
| parent | 4b972a01a7da614b4796475f933094751a295a2f (diff) | |
Merge tag 'v5.2-rc6' into generic-dma-ops
Linux 5.2-rc6
Diffstat (limited to 'include/linux/platform_data/dmtimer-omap.h')
| -rw-r--r-- | include/linux/platform_data/dmtimer-omap.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/include/linux/platform_data/dmtimer-omap.h b/include/linux/platform_data/dmtimer-omap.h index 757a0f9e26f9..bdaaf537604a 100644 --- a/include/linux/platform_data/dmtimer-omap.h +++ b/include/linux/platform_data/dmtimer-omap.h | |||
| @@ -1,20 +1,9 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0-only */ | ||
| 1 | /* | 2 | /* |
| 2 | * DMTIMER platform data for TI OMAP platforms | 3 | * DMTIMER platform data for TI OMAP platforms |
| 3 | * | 4 | * |
| 4 | * Copyright (C) 2012 Texas Instruments | 5 | * Copyright (C) 2012 Texas Instruments |
| 5 | * Author: Jon Hunter <jon-hunter@ti.com> | 6 | * Author: Jon Hunter <jon-hunter@ti.com> |
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify it | ||
| 8 | * under the terms of the GNU General Public License version 2 as published by | ||
| 9 | * the Free Software Foundation. | ||
| 10 | * | ||
| 11 | * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| 12 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
| 13 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
| 14 | * more details. | ||
| 15 | * | ||
| 16 | * You should have received a copy of the GNU General Public License along with | ||
| 17 | * this program. If not, see <http://www.gnu.org/licenses/>. | ||
| 18 | */ | 7 | */ |
| 19 | 8 | ||
| 20 | #ifndef __PLATFORM_DATA_DMTIMER_OMAP_H__ | 9 | #ifndef __PLATFORM_DATA_DMTIMER_OMAP_H__ |
