Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=1791f539cd441c3f7926f2c449487af2b95466a1
Commit:     1791f539cd441c3f7926f2c449487af2b95466a1
Parent:     b8ed6b4d833360fa7ba8635ad0c8d8bba5386e0e
Author:     Jesper Nilsson <[EMAIL PROTECTED]>
AuthorDate: Tue Jan 29 10:43:05 2008 +0100
Committer:  Jesper Nilsson <[EMAIL PROTECTED]>
CommitDate: Fri Feb 8 11:06:39 2008 +0100

    CRIS v32: Minor changes to avoid errors in 
asm-cris/arch-v32/hwregs/reg_rdwr.h
    
    - Add ifdef around macros to read and write hardware registers
    - Add parens around REG_READ expression to avoid possible precedence errors.
    - Remove useless CVS id tag.
---
 include/asm-cris/arch-v32/hwregs/reg_rdwr.h |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/include/asm-cris/arch-v32/hwregs/reg_rdwr.h 
b/include/asm-cris/arch-v32/hwregs/reg_rdwr.h
index 44e6023..236f91e 100644
--- a/include/asm-cris/arch-v32/hwregs/reg_rdwr.h
+++ b/include/asm-cris/arch-v32/hwregs/reg_rdwr.h
@@ -1,15 +1,17 @@
-/* $Id: reg_rdwr.h,v 1.6 2005/04/24 18:30:58 starvik Exp $
- *
+/*
  * Read/write register macros used by *_defs.h
  */
 
 #ifndef reg_rdwr_h
 #define reg_rdwr_h
 
+#ifndef REG_READ
+#define REG_READ(type, addr) (*((volatile type *) (addr)))
+#endif
 
-#define REG_READ(type, addr) *((volatile type *) (addr))
-
+#ifndef REG_WRITE
 #define REG_WRITE(type, addr, val) \
    do { *((volatile type *) (addr)) = (val); } while(0)
+#endif
 
 #endif
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to