Merge to Fedora kernel-2.6.7-1.441

[linux-2.6.git] / include / asm-s390 / types.h

diff --git a/include/asm-s390/types.h b/include/asm-s390/types.h
index dd57b3f..3fefd61 100644 (file)
--- a/include/asm-s390/types.h
+++ b/include/asm-s390/types.h
@@ -79,6 +79,8 @@ typedef unsigned  long u64;
 
 typedef u32 dma_addr_t;
 
+typedef unsigned int kmem_bufctl_t;
+
 #ifndef __s390x__
 typedef union {
        unsigned long long pair;
@@ -94,9 +96,6 @@ typedef u64 sector_t;
 #endif
 
 #endif /* ! __s390x__   */
-
-typedef unsigned int kmem_bufctl_t;
-
 #endif /* __ASSEMBLY__  */
 #endif /* __KERNEL__    */
 #endif /* _S390_TYPES_H */