Merge samba.org:/home/paulus/kernel/linux-2.5

into samba.org:/home/paulus/kernel/for-linus-ppc

1 files changed, 14 insertions, 10 deletions

diff --git a/include/asm-ppc/types.h b/include/asm-ppc/types.h
index 26dd36dec197..3c74a27697d5 100644
--- a/include/asm-ppc/types.h
+++ b/include/asm-ppc/types.h
@@ -21,10 +21,22 @@ typedef struct {
 	__u32 u[4];
 } __attribute((aligned(16))) __vector128;
 
+/*
+ * XXX allowed outside of __KERNEL__ for now, until glibc gets
+ * a proper set of asm headers of its own.  -- paulus
+ */
+typedef unsigned short umode_t;
+
+#endif /* __ASSEMBLY__ */
+
 #ifdef __KERNEL__
 /*
  * These aren't exported outside the kernel to avoid name space clashes
  */
+#define BITS_PER_LONG 32
+
+#ifndef __ASSEMBLY__
+
 typedef signed char s8;
 typedef unsigned char u8;
 
@@ -39,8 +51,6 @@ typedef unsigned long long u64;
 
 typedef __vector128 vector128;
 
-#define BITS_PER_LONG 32
-
 /* DMA addresses are 32-bits wide */
 typedef u32 dma_addr_t;
 typedef u64 dma64_addr_t;
@@ -50,14 +60,8 @@ typedef u64 sector_t;
 #define HAVE_SECTOR_T
 #endif
 
-#endif /* __KERNEL__ */
-
-/*
- * XXX allowed outside of __KERNEL__ for now, until glibc gets
- * a proper set of asm headers of its own.  -- paulus
- */
-typedef unsigned short umode_t;
-
 #endif /* __ASSEMBLY__ */
 
+#endif /* __KERNEL__ */
+
 #endif