Home » Mailing list archives » linux-kernel » 2007 » November » 30

[PATCH 38/47] Include path fix for CRISv32 timex.h

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
[view in full thread]
From: Jesper Nilsson
Subject: [PATCH 38/47] Include path fix for CRISv32 timex.h
Date: Friday, November 30, 2007 - 9:28 am

- Shorten include path for machine dependent header files.
- Correct some formatting issues.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
---
 include/asm-cris/arch-v32/timex.h |    8 ++++----
 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);
 
-- 
1.5.3.6.970.gd25430

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
Messages in current thread:
[PATCH 00/47] CRIS patches for CRISv32 EtraxFS and ARTPEC-3, Jesper Nilsson, (Thu Nov 29, 9:02 am)
[PATCH 02/47] Add new driver files for Artpec-3., Jesper Nilsson, (Thu Nov 29, 9:03 am)
[PATCH 03/47] Add new driver files for Etrax-FS, Jesper Nilsson, (Thu Nov 29, 9:05 am)
[PATCH 04/47] Add new machine dependent files for Etrax-FS ..., Jesper Nilsson, (Thu Nov 29, 9:11 am)
[PATCH 06/47] Add serial driver for CRISv32., Jesper Nilsson, (Thu Nov 29, 9:23 am)
[PATCH 07/47] Add L2 cache initialization code., Jesper Nilsson, (Thu Nov 29, 9:24 am)
[PATCH 08/47] Add SECOND_WORD_SYNC, used in CRISv32 versio ..., Jesper Nilsson, (Thu Nov 29, 9:26 am)
[PATCH 09/47] Update CRISv32 synchronous serial driver., Jesper Nilsson, (Thu Nov 29, 9:30 am)
[PATCH 10/47] Merge axisflashmap.h with Axis internal changes., Jesper Nilsson, (Thu Nov 29, 9:58 am)
[PATCH 11/47] Minor fixes to CRISv32 irq defines., Jesper Nilsson, (Thu Nov 29, 10:11 am)
[PATCH 12/47] Remove unnecessary CVS log from cris/mm/init.c, Jesper Nilsson, (Thu Nov 29, 10:19 am)
[PATCH 13/47] Add prototypes for cache flushing on CRISv32, Jesper Nilsson, (Fri Nov 30, 2:11 am)
[PATCH 15/47] Minor fixes to mm/fault.c for CRIS., Jesper Nilsson, (Fri Nov 30, 5:59 am)
[PATCH 16/47] Minor CRIS generic kernel/traps.c changes., Jesper Nilsson, (Fri Nov 30, 6:11 am)
[PATCH 17/47] Add handling of PTRACE_DETATCH for CRISv32. ..., Jesper Nilsson, (Fri Nov 30, 6:14 am)
[PATCH 18/47] Remove define ARCH_HAS_DMA_DECLARE_COHERENT_ ..., Jesper Nilsson, (Fri Nov 30, 7:40 am)
[PATCH 19/47] Update CRISv32 entry.S to working order., Jesper Nilsson, (Fri Nov 30, 7:44 am)
[PATCH 20/47] Fixup CRISv32 kernel Makefile., Jesper Nilsson, (Fri Nov 30, 7:47 am)
[PATCH 21/47] New version of CRISv32 I2C driver., Jesper Nilsson, (Fri Nov 30, 7:54 am)
[PATCH 22/47] Update and improve axisflashmap for CRISv32., Jesper Nilsson, (Fri Nov 30, 8:01 am)
[PATCH 23/47] Update CRIS main Kbuild makefile., Jesper Nilsson, (Fri Nov 30, 8:07 am)
[PATCH 25/47] Update CRISv10 boot compressed Kbuild makefile., Jesper Nilsson, (Fri Nov 30, 8:10 am)
[PATCH 26/47] Update CRISv10 rescue Kbuild makefile., Jesper Nilsson, (Fri Nov 30, 8:11 am)
[PATCH 27/47] Update CRISv10 rescue head.s, Jesper Nilsson, (Fri Nov 30, 8:13 am)
[PATCH 28/47] Update and improve CRISv10 axisflashmap.c, Jesper Nilsson, (Fri Nov 30, 8:17 am)
[PATCH 29/47] Update CRISv32 traps.c, Jesper Nilsson, (Fri Nov 30, 8:22 am)
[PATCH 30/47] Update CRISv32 boot Kbuild makefile., Jesper Nilsson, (Fri Nov 30, 8:24 am)
[PATCH 31/47] Update CRISv32 boot compressed Kbuild makefile., Jesper Nilsson, (Fri Nov 30, 8:25 am)
[PATCH 32/47] Update CRISv32 boot rescue Kbuild makefile., Jesper Nilsson, (Fri Nov 30, 8:28 am)
[PATCH 33/47] Remove CRISv32 common gpio and nandflash, ad ..., Jesper Nilsson, (Fri Nov 30, 8:30 am)
[PATCH 34/47] Update CRISv32 compressed head.S, Jesper Nilsson, (Fri Nov 30, 8:40 am)
[PATCH 35/47] Update CRISv32 boot/compressed/misc.c, Jesper Nilsson, (Fri Nov 30, 9:16 am)
[PATCH 36/47] Update CRISv32 boot/rescue/head.S code., Jesper Nilsson, (Fri Nov 30, 9:20 am)
[PATCH 37/47] Update CRISv32 debugport., Jesper Nilsson, (Fri Nov 30, 9:26 am)
[PATCH 38/47] Include path fix for CRISv32 timex.h, Jesper Nilsson, (Fri Nov 30, 9:28 am)
[PATCH 40/47] Update CRISv32 kernel/head.S, Jesper Nilsson, (Fri Nov 30, 9:54 am)
[PATCH 41/47] Update and simplify CRISv32 kernel/irq.c., Jesper Nilsson, (Fri Nov 30, 10:09 am)
[PATCH] Remove rcu_assign_pointer() penalty for NULL pointers, Paul E. McKenney, (Fri Nov 30, 5:37 pm)
Re: [PATCH] Remove rcu_assign_pointer() penalty for NULL p ..., Herbert Xu, (Fri Nov 30, 6:07 pm)
[PATCH 42/47] Minor updates to CRISv32 kernel/process.c, Jesper Nilsson, (Mon Dec 3, 2:54 am)
[PATCH 43/47] Update and improve CRISv32 kernel/traps.c, Jesper Nilsson, (Mon Dec 3, 3:12 am)
[PATCH 44/47] Minor fixes for CRISv32 io.h, Jesper Nilsson, (Mon Dec 3, 3:16 am)
[PATCH 45/47] New default config for CRISv10., Jesper Nilsson, (Mon Dec 3, 3:37 am)
[PATCH 47/47] Add new defconfigs for Artpec-3 and EtraxFS, ..., Jesper Nilsson, (Tue Dec 4, 9:40 am)
Re: [PATCH 27/47] Update CRISv10 rescue head.s, Jesper Nilsson, (Thu Dec 6, 5:46 pm)
Re: [PATCH 00/47] CRIS patches for CRISv32 EtraxFS and ART ..., Andrew Morton, (Wed Dec 12, 3:52 am)
Re: [PATCH 06/47] Add serial driver for CRISv32., Andrew Morton, (Wed Dec 12, 4:14 am)
Re: [PATCH 15/47] Minor fixes to mm/fault.c for CRIS., Andrew Morton, (Wed Dec 12, 4:17 am)
Re: [PATCH 21/47] New version of CRISv32 I2C driver., Andrew Morton, (Wed Dec 12, 4:19 am)
Re: [PATCH 29/47] Update CRISv32 traps.c, Andrew Morton, (Wed Dec 12, 4:21 am)
Re: [PATCH 39/47] Update and improve CRISv32 fasttimer.c, Andrew Morton, (Wed Dec 12, 4:23 am)
Re: [PATCH 42/47] Minor updates to CRISv32 kernel/process.c, Andrew Morton, (Wed Dec 12, 4:24 am)
Re: [PATCH 44/47] Minor fixes for CRISv32 io.h, Andrew Morton, (Wed Dec 12, 4:29 am)
Re: [PATCH 46/47] Update and improve CRISv32 kernel/time.c, Andrew Morton, (Wed Dec 12, 4:33 am)
Re: [PATCH 00/47] CRIS patches for CRISv32 EtraxFS and ART ..., Jesper Nilsson, (Wed Dec 12, 6:28 am)
Re: [PATCH 00/47] CRIS patches for CRISv32 EtraxFS and ART ..., Adrian Bunk, (Wed Dec 12, 6:28 am)
Re: [PATCH 15/47] Minor fixes to mm/fault.c for CRIS., Jesper Nilsson, (Wed Dec 12, 6:36 am)
Re: [PATCH 00/47] CRIS patches for CRISv32 EtraxFS and ART ..., Jesper Nilsson, (Wed Dec 12, 6:46 am)
Re: [PATCH 44/47] Minor fixes for CRISv32 io.h, Jesper Nilsson, (Wed Dec 12, 10:04 am)