diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-07-15 12:42:32 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-07-15 12:42:32 -0400 |
| commit | ecb41832bd2a7a3f8ac93527cec5e51e3827daed (patch) | |
| tree | a382a3719eca9ac8a22ae7f1715d0bd4843dc8e2 /include/linux/input/sparse-keymap.h | |
| parent | d38b6cf50a6b911ee46683330f3af17fcceca509 (diff) | |
| parent | 0ecfebd2b52404ae0c54a878c872bb93363ada36 (diff) | |
Merge tag 'v5.2' into next
Sync up with mainline to resolve conflicts in iforce driver.
Diffstat (limited to 'include/linux/input/sparse-keymap.h')
| -rw-r--r-- | include/linux/input/sparse-keymap.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/linux/input/sparse-keymap.h b/include/linux/input/sparse-keymap.h index c7346e33d958..d25d1452dc6e 100644 --- a/include/linux/input/sparse-keymap.h +++ b/include/linux/input/sparse-keymap.h | |||
| @@ -1,12 +1,9 @@ | |||
| 1 | /* SPDX-License-Identifier: GPL-2.0-only */ | ||
| 1 | #ifndef _SPARSE_KEYMAP_H | 2 | #ifndef _SPARSE_KEYMAP_H |
| 2 | #define _SPARSE_KEYMAP_H | 3 | #define _SPARSE_KEYMAP_H |
| 3 | 4 | ||
| 4 | /* | 5 | /* |
| 5 | * Copyright (c) 2009 Dmitry Torokhov | 6 | * Copyright (c) 2009 Dmitry Torokhov |
| 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 | */ | 7 | */ |
| 11 | 8 | ||
| 12 | #define KE_END 0 /* Indicates end of keymap */ | 9 | #define KE_END 0 /* Indicates end of keymap */ |