summaryrefslogtreecommitdiffstats
path: root/include/asm-cris
diff options
context:
space:
mode:
authorJesper Nilsson <jesper.nilsson@axis.com>2007-11-30 17:28:05 +0100
committerJesper Nilsson <jesper.nilsson@axis.com>2008-02-08 11:06:27 +0100
commite867cefbaaac23644414cfe562b4fee7dc604f2e (patch)
tree4586693251d5dc756554e12ccf12d1dd75ee28ff /include/asm-cris
parent822641026238421a70ad20af513758ef927527e5 (diff)
downloadop-kernel-dev-e867cefbaaac23644414cfe562b4fee7dc604f2e.zip
op-kernel-dev-e867cefbaaac23644414cfe562b4fee7dc604f2e.tar.gz
CRIS v32: Include path fix for timex.h
- Shorten include path for machine dependent header files. - Correct some formatting issues.
Diffstat (limited to 'include/asm-cris')
-rw-r--r--include/asm-cris/arch-v32/timex.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/asm-cris/arch-v32/timex.h b/include/asm-cris/arch-v32/timex.h
index 5a4aa28..2591d3c 100644
--- a/include/asm-cris/arch-v32/timex.h
+++ b/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);
OpenPOWER on IntegriCloud