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/input/sparse-keymap.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/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 */ |