diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-07-02 12:01:31 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2013-07-02 12:01:31 -0400 |
| commit | 27eb2c4b3d3e13f376a359e293c212a2e9407af5 (patch) | |
| tree | 556aa7b5cd6eeb4214dec129c789515157187010 /drivers/input/joystick | |
| parent | 5705b8aca5a80141de5637ff0e23b31b26f2c5bf (diff) | |
| parent | 67bf12ca50d524f9e225347fe63533562e2004de (diff) | |
Merge branch 'next' into for-linus
Prepare first set of updates for 3.11 merge window.
Diffstat (limited to 'drivers/input/joystick')
| -rw-r--r-- | drivers/input/joystick/analog.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/input/joystick/analog.c b/drivers/input/joystick/analog.c index 7cd74e29cbc8..9135606c8649 100644 --- a/drivers/input/joystick/analog.c +++ b/drivers/input/joystick/analog.c | |||
| @@ -158,14 +158,10 @@ static unsigned int get_time_pit(void) | |||
| 158 | #define GET_TIME(x) rdtscl(x) | 158 | #define GET_TIME(x) rdtscl(x) |
| 159 | #define DELTA(x,y) ((y)-(x)) | 159 | #define DELTA(x,y) ((y)-(x)) |
| 160 | #define TIME_NAME "TSC" | 160 | #define TIME_NAME "TSC" |
| 161 | #elif defined(__alpha__) | 161 | #elif defined(__alpha__) || defined(CONFIG_MN10300) || defined(CONFIG_ARM) || defined(CONFIG_TILE) |
| 162 | #define GET_TIME(x) do { x = get_cycles(); } while (0) | 162 | #define GET_TIME(x) do { x = get_cycles(); } while (0) |
| 163 | #define DELTA(x,y) ((y)-(x)) | 163 | #define DELTA(x,y) ((y)-(x)) |
| 164 | #define TIME_NAME "PCC" | 164 | #define TIME_NAME "get_cycles" |
| 165 | #elif defined(CONFIG_MN10300) || defined(CONFIG_TILE) | ||
| 166 | #define GET_TIME(x) do { x = get_cycles(); } while (0) | ||
| 167 | #define DELTA(x, y) ((x) - (y)) | ||
| 168 | #define TIME_NAME "TSC" | ||
| 169 | #else | 165 | #else |
| 170 | #define FAKE_TIME | 166 | #define FAKE_TIME |
| 171 | static unsigned long analog_faketime = 0; | 167 | static unsigned long analog_faketime = 0; |