diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-05 16:45:06 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-05 16:45:06 -0800 |
| commit | 65c64d1845fbc6420f8836e8731ea6c3012e8e7d (patch) | |
| tree | e7652f8508b9f1da90f234b20e17212d08d5bc0b /drivers/input/joystick | |
| parent | Merge tag 'iommu-v4.15-rc7' of git://github.com/awilliam/linux-vfio (diff) | |
| parent | Input: xen-kbdfront - do not advertise multi-touch pressure support (diff) | |
| download | linux-dev-65c64d1845fbc6420f8836e8731ea6c3012e8e7d.tar.xz linux-dev-65c64d1845fbc6420f8836e8731ea6c3012e8e7d.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input fixes from Dmitry Torokhov:
"Just a few driver fixups, nothing exciting"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: xen-kbdfront - do not advertise multi-touch pressure support
Input: hideep - fix compile error due to missing include file
Input: elants_i2c - do not clobber interrupt trigger on x86
Input: joystick/analog - riscv has get_cycles()
Input: elantech - add new icbody type 15
Input: ims-pcu - fix typo in the error message
Diffstat (limited to 'drivers/input/joystick')
| -rw-r--r-- | drivers/input/joystick/analog.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c index 3d8ff09eba57..c868a878c84f 100644 --- a/drivers/input/joystick/analog.c +++ b/drivers/input/joystick/analog.c @@ -163,7 +163,7 @@ static unsigned int get_time_pit(void) #define GET_TIME(x) do { x = (unsigned int)rdtsc(); } while (0) #define DELTA(x,y) ((y)-(x)) #define TIME_NAME "TSC" -#elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_TILE) +#elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_ARM64) || defined(CONFIG_RISCV) || defined(CONFIG_TILE) #define GET_TIME(x) do { x = get_cycles(); } while (0) #define DELTA(x,y) ((y)-(x)) #define TIME_NAME "get_cycles" |