diff options
| author | David S. Miller <davem@davemloft.net> | 2019-06-22 08:59:24 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-06-22 08:59:24 -0400 |
| commit | 92ad6325cb891bb455487bfe90cc47d18aa6ec37 (patch) | |
| tree | 433a7ef938fae69789216043f67eff9f9c6b0c68 /include/linux/led-class-flash.h | |
| parent | e0effb5fbd56a8b2b8917611cbf4fcd9aba92b8f (diff) | |
| parent | c356dc4b540edd6c02b409dd8cf3208ba2804c38 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor SPDX change conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/led-class-flash.h')
| -rw-r--r-- | include/linux/led-class-flash.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/linux/led-class-flash.h b/include/linux/led-class-flash.h index 700efaa9e115..f52713f0a269 100644 --- a/include/linux/led-class-flash.h +++ b/include/linux/led-class-flash.h | |||
| @@ -1,13 +1,9 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0-only */ | ||
| 1 | /* | 2 | /* |
| 2 | * LED Flash class interface | 3 | * LED Flash class interface |
| 3 | * | 4 | * |
| 4 | * Copyright (C) 2015 Samsung Electronics Co., Ltd. | 5 | * Copyright (C) 2015 Samsung Electronics Co., Ltd. |
| 5 | * Author: Jacek Anaszewski <j.anaszewski@samsung.com> | 6 | * Author: Jacek Anaszewski <j.anaszewski@samsung.com> |
| 6 | * | ||
| 7 | * This program is free software; you can redistribute it and/or modify | ||
| 8 | * it under the terms of the GNU General Public License version 2 as | ||
| 9 | * published by the Free Software Foundation. | ||
| 10 | * | ||
| 11 | */ | 7 | */ |
| 12 | #ifndef __LINUX_FLASH_LEDS_H_INCLUDED | 8 | #ifndef __LINUX_FLASH_LEDS_H_INCLUDED |
| 13 | #define __LINUX_FLASH_LEDS_H_INCLUDED | 9 | #define __LINUX_FLASH_LEDS_H_INCLUDED |