Browse Source

blackfin: types: use <asm-generic/int-*.h> for the blackfin architecture

This modifies <asm-blackfin/types.h> to use the <asm-generic/int-*.h>
generic include files.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Cc: Bryan Wu <cooloney@kernel.org>
H. Peter Anvin 17 years ago
parent
commit
5424a328d2
1 changed files with 2 additions and 32 deletions
  1. 2 32
      include/asm-blackfin/types.h

+ 2 - 32
include/asm-blackfin/types.h

@@ -8,30 +8,12 @@
  * not a major issue.  However, for interoperability, libraries still
  * not a major issue.  However, for interoperability, libraries still
  * need to be careful to avoid a name clashes.
  * need to be careful to avoid a name clashes.
  */
  */
+#include <asm-generic/int-ll64.h>
+
 #ifndef __ASSEMBLY__
 #ifndef __ASSEMBLY__
 
 
 typedef unsigned short umode_t;
 typedef unsigned short umode_t;
 
 
-/*
- * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
- * header files exported to user space
- */
-
-typedef __signed__ char __s8;
-typedef unsigned char __u8;
-
-typedef __signed__ short __s16;
-typedef unsigned short __u16;
-
-typedef __signed__ int __s32;
-typedef unsigned int __u32;
-
-/* HK0617   -- Changes to unsigned long temporarily */
-#if defined(__GNUC__)
-__extension__ typedef __signed__ long long __s64;
-__extension__ typedef unsigned long long __u64;
-#endif
-
 #endif				/* __ASSEMBLY__ */
 #endif				/* __ASSEMBLY__ */
 /*
 /*
  * These aren't exported outside the kernel to avoid name space clashes
  * These aren't exported outside the kernel to avoid name space clashes
@@ -42,18 +24,6 @@ __extension__ typedef unsigned long long __u64;
 
 
 #ifndef __ASSEMBLY__
 #ifndef __ASSEMBLY__
 
 
-typedef signed char s8;
-typedef unsigned char u8;
-
-typedef signed short s16;
-typedef unsigned short u16;
-
-typedef signed int s32;
-typedef unsigned int u32;
-
-typedef signed long long s64;
-typedef unsigned long long u64;
-
 /* Dma addresses are 32-bits wide.  */
 /* Dma addresses are 32-bits wide.  */
 
 
 typedef u32 dma_addr_t;
 typedef u32 dma_addr_t;