Merge master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6-omap-h63xx.git] / include / asm-parisc / types.h

diff --git a/include/asm-parisc/types.h b/include/asm-parisc/types.h
index d21b9d0d63eabc37485671c951a7fc2dee470775..34fdce361a5abbebfef5645a3399a20e0515f226 100644 (file)
--- a/include/asm-parisc/types.h
+++ b/include/asm-parisc/types.h
@@ -33,8 +33,10 @@ typedef unsigned long long __u64;
 
 #ifdef __LP64__
 #define BITS_PER_LONG 64
+#define SHIFT_PER_LONG 6
 #else
 #define BITS_PER_LONG 32
+#define SHIFT_PER_LONG 5
 #endif
 
 #ifndef __ASSEMBLY__