USB: make SA1111 OHCI driver SA11x0 specific

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

diff --git a/include/asm-sparc/types.h b/include/asm-sparc/types.h
index 42fc6ed9815690e563fceb6ca1590df9e86f5df4..8c28fde5eaa2a794fd8b31fd4a95e9e00699f3f5 100644 (file)
--- a/include/asm-sparc/types.h
+++ b/include/asm-sparc/types.h
@@ -1,12 +1,5 @@
-/* $Id: types.h,v 1.13 2001/12/21 01:22:59 davem Exp $ */
 #ifndef _SPARC_TYPES_H
 #define _SPARC_TYPES_H
-
-/*
- * _xx is ok: it doesn't pollute the POSIX namespace. Use these in the
- * header files exported to user space.
- */
-
 /*
  * This file is never included by application software unless
  * explicitly requested (e.g., via linux/types.h) in which case the
@@ -15,41 +8,47 @@
  * need to be careful to avoid a name clashes.
  */
 
+#if defined(__sparc__) && defined(__arch64__)
+
+/*** SPARC 64 bit ***/
+#include <asm-generic/int-l64.h>
+
 #ifndef __ASSEMBLY__
 
 typedef unsigned short umode_t;
 
-typedef __signed__ char __s8;
-typedef unsigned char __u8;
+#endif /* __ASSEMBLY__ */
+
+#ifdef __KERNEL__
 
-typedef __signed__ short __s16;
-typedef unsigned short __u16;
+#define BITS_PER_LONG 64
+
+#ifndef __ASSEMBLY__
 
-typedef __signed__ int __s32;
-typedef unsigned int __u32;
+/* Dma addresses come in generic and 64-bit flavours.  */
 
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
+typedef u32 dma_addr_t;
+typedef u64 dma64_addr_t;
 
 #endif /* __ASSEMBLY__ */
 
-#ifdef __KERNEL__
+#endif /* __KERNEL__ */
+#else
 
-#define BITS_PER_LONG 32
+/*** SPARC 32 bit ***/
+#include <asm-generic/int-ll64.h>
 
 #ifndef __ASSEMBLY__
 
-typedef __signed__ char s8;
-typedef unsigned char u8;
+typedef unsigned short umode_t;
 
-typedef __signed__ short s16;
-typedef unsigned short u16;
+#endif /* __ASSEMBLY__ */
 
-typedef __signed__ int s32;
-typedef unsigned int u32;
+#ifdef __KERNEL__
 
-typedef __signed__ long long s64;
-typedef unsigned long long u64;
+#define BITS_PER_LONG 32
+
+#ifndef __ASSEMBLY__
 
 typedef u32 dma_addr_t;
 typedef u32 dma64_addr_t;
@@ -58,4 +57,6 @@ typedef u32 dma64_addr_t;
 
 #endif /* __KERNEL__ */
 
+#endif /* defined(__sparc__) && defined(__arch64__) */
+
 #endif /* defined(_SPARC_TYPES_H) */