From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 12 Aug 2011 00:54:42 +0000 (+1000)
Subject: Merge remote-tracking branch 'input-current/for-linus'
X-Git-Tag: next-20110812~83
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=84047682a76a81441da8a2eff0703da19bd1a6d6;p=karo-tx-linux.git

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

84047682a76a81441da8a2eff0703da19bd1a6d6
diff --cc drivers/input/joystick/analog.c
index 9882971827e6,c02131785a36..358cd7ee905b
--- a/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)
  {