Merge remote-tracking branch 'input-current/for-linus'

diff --cc drivers/input/joystick/analog.c
index 9882971827e6325bd7a424ef83b13b5679cec8d1,c02131785a3688a6a18563f006cddbb792eccdc8..358cd7ee905b7ff4f9a7498e277341037437bf19
--- 1/drivers/input/joystick/analog.c
--- 2/drivers/input/joystick/analog.c
+++ b/drivers/input/joystick/analog.c
@@@ -136,10 -136,10 +136,10 @@@ struct analog_port 
  
  #ifdef __i386__
  
 -#include <asm/i8253.h>
 +#include <linux/i8253.h>
  
  #define GET_TIME(x)   do { if (cpu_has_tsc) rdtscl(x); else x = get_time_pit(); } while (0)
- #define DELTA(x,y)    (cpu_has_tsc ? ((y) - (x)) : ((x) - (y) + ((x) < (y) ? CLOCK_TICK_RATE / HZ : 0)))
+ #define DELTA(x,y)    (cpu_has_tsc ? ((y) - (x)) : ((x) - (y) + ((x) < (y) ? PIT_TICK_RATE / HZ : 0)))
  #define TIME_NAME     (cpu_has_tsc?"TSC":"PIT")
  static unsigned int get_time_pit(void)
  {