---

yaml --- r: 349712 b: refs/heads/master c: 84e4e46 h: refs/heads/master v: v3
git-mirror · Feb 4, 2013 · ec3ca9f · ec3ca9f
1 parent d34d2bb
commit ec3ca9f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 99a844b7319fef4f41794efdc3ecdd74920cd756
+refs/heads/master: 84e4e46020cdb0e091858eb8263a2287880e2bad
diff --git a/trunk/drivers/input/joystick/analog.c b/trunk/drivers/input/joystick/analog.c
@@ -162,7 +162,7 @@ static unsigned int get_time_pit(void)
 #define GET_TIME(x)	do { x = get_cycles(); } while (0)
 #define DELTA(x,y)	((y)-(x))
 #define TIME_NAME	"PCC"
-#elif defined(CONFIG_MN10300)
+#elif defined(CONFIG_MN10300) || defined(CONFIG_TILE)
 #define GET_TIME(x)	do { x = get_cycles(); } while (0)
 #define DELTA(x, y)	((x) - (y))
 #define TIME_NAME	"TSC"