diff options
| author |   Deepa Dinamani <deepa.kernel@gmail.com> | 2019-01-24 00:29:20 -0800 |
|---|---|---|
| committer |   Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2019-01-24 00:38:39 -0800 |
| commit | 141e5dcaa7356077028b4cd48ec351a38c70e5e5 (patch) | |
| tree | 6f25c4e23acbea8ccd5aded60481ae901f994b43 /include | |
| parent | Input: olpc_apsp - assign priv->dev earlier (diff) | |
| download | linux-dev-141e5dcaa7356077028b4cd48ec351a38c70e5e5.tar.xz linux-dev-141e5dcaa7356077028b4cd48ec351a38c70e5e5.zip | |
Input: input_event - fix the CONFIG_SPARC64 mixup
Arnd Bergmann pointed out that CONFIG_* cannot be used in a uapi header.
Override with an equivalent conditional.
Fixes: 2e746942ebac ("Input: input_event - provide override for sparc64")
Fixes: 152194fe9c3f ("Input: extend usable life of event timestamps to 2106 on 32 bit systems")
Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/uapi/linux/input.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/uapi/linux/input.h b/include/uapi/linux/input.h index ffab958bc512..f056b2a00d5c 100644 --- a/include/uapi/linux/input.h +++ b/include/uapi/linux/input.h @@ -32,7 +32,7 @@ struct input_event { #define input_event_usec time.tv_usec #else __kernel_ulong_t __sec; -#ifdef CONFIG_SPARC64 +#if defined(__sparc__) && defined(__arch64__) unsigned int __usec; #else __kernel_ulong_t __usec; |