From 5942f4c04e7a43ce4f0060f89f76e438c19e3317 Mon Sep 17 00:00:00 2001
From: Jesper Nilsson <jesper.nilsson@axis.com>
Date: Fri, 30 Nov 2007 17:28:05 +0100
Subject: [PATCH] --- yaml --- r: 84943 b: refs/heads/master c:
 e867cefbaaac23644414cfe562b4fee7dc604f2e h: refs/heads/master i:   84941:
 f04576680c81d2935dced3b3c3040acdfb6f42a1   84939:
 8b257771711e27f265f0399065346bdbd6e84967   84935:
 91f533b3c3818f839e07c7b847d4f2db1b59c8d9   84927:
 58a52fbbee7c15e6eb4b50ba63b44f55528d6f7e v: v3

---
 [refs]                                  | 2 +-
 trunk/include/asm-cris/arch-v32/timex.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 29136ea36c24..1544dcef6c59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 822641026238421a70ad20af513758ef927527e5
+refs/heads/master: e867cefbaaac23644414cfe562b4fee7dc604f2e
diff --git a/trunk/include/asm-cris/arch-v32/timex.h b/trunk/include/asm-cris/arch-v32/timex.h
index 5a4aa285d5fd..2591d3c5ed9d 100644
--- a/trunk/include/asm-cris/arch-v32/timex.h
+++ b/trunk/include/asm-cris/arch-v32/timex.h
@@ -1,9 +1,9 @@
 #ifndef _ASM_CRIS_ARCH_TIMEX_H
 #define _ASM_CRIS_ARCH_TIMEX_H
 
-#include <asm/arch/hwregs/reg_map.h>
-#include <asm/arch/hwregs/reg_rdwr.h>
-#include <asm/arch/hwregs/timer_defs.h>
+#include <hwregs/reg_map.h>
+#include <hwregs/reg_rdwr.h>
+#include <hwregs/timer_defs.h>
 
 /*
  * The clock runs at 100MHz, we divide it by 1000000. If you change anything
@@ -18,7 +18,7 @@
 
 /* Convert the value in step of 10 ns to 1us without overflow: */
 #define GET_JIFFIES_USEC() \
-  ( (TIMER0_DIV - REG_RD(timer, regi_timer, r_tmr0_data)) /100 )
+	((TIMER0_DIV - REG_RD(timer, regi_timer0, r_tmr0_data)) / 100)
 
 extern unsigned long get_ns_in_jiffie(void);