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/serdev.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/serdev.h')
| -rw-r--r-- | include/linux/serdev.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/include/linux/serdev.h b/include/linux/serdev.h index 070bf4e92df7..9f14f9c12ec4 100644 --- a/include/linux/serdev.h +++ b/include/linux/serdev.h | |||
| @@ -1,14 +1,6 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0-only */ | ||
| 1 | /* | 2 | /* |
| 2 | * Copyright (C) 2016-2017 Linaro Ltd., Rob Herring <robh@kernel.org> | 3 | * Copyright (C) 2016-2017 Linaro Ltd., Rob Herring <robh@kernel.org> |
| 3 | * | ||
| 4 | * This program is free software; you can redistribute it and/or modify | ||
| 5 | * it under the terms of the GNU General Public License version 2 and | ||
| 6 | * only version 2 as published by the Free Software Foundation. | ||
| 7 | * | ||
| 8 | * This program is distributed in the hope that it will be useful, | ||
| 9 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 10 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 11 | * GNU General Public License for more details. | ||
| 12 | */ | 4 | */ |
| 13 | #ifndef _LINUX_SERDEV_H | 5 | #ifndef _LINUX_SERDEV_H |
| 14 | #define _LINUX_SERDEV_H | 6 | #define _LINUX_SERDEV_H |