Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux-2.6

[karo-tx-linux.git] / include / linux / const.h

diff --git a/include/linux/const.h b/include/linux/const.h
index 07b300bfe34b01f27d424b7f5c63f43130582f7d..c22c707c455d6b379afa6c2642640e6b6277541e 100644 (file)
--- a/include/linux/const.h
+++ b/include/linux/const.h
@@ -7,13 +7,18 @@
  * C code.  Therefore we cannot annotate them always with
  * 'UL' and other type specifiers unilaterally.  We
  * use the following macros to deal with this.
+ *
+ * Similarly, _AT() will cast an expression with a type in C, but
+ * leave it unchanged in asm.
  */
 
 #ifdef __ASSEMBLY__
 #define _AC(X,Y)       X
+#define _AT(T,X)       X
 #else
 #define __AC(X,Y)      (X##Y)
 #define _AC(X,Y)       __AC(X,Y)
+#define _AT(T,X)       ((T)(X))
 #endif
 
 #endif /* !(_LINUX_CONST_H) */