From: H. Peter Anvin Date: Sun, 6 Apr 2008 17:35:12 +0000 (-0700) Subject: sparc: types: use for the sparc architecture X-Git-Tag: v2.6.26-rc1~2^2~6 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a3727dc6c21cd0bed64dbc97212c39d2b391f5af;p=linux-2.6-omap-h63xx.git sparc: types: use for the sparc architecture This modifies to use the generic include files. Signed-off-by: H. Peter Anvin Cc: William L. Irwin Signed-off-by: David S. Miller --- diff --git a/include/asm-sparc/types.h b/include/asm-sparc/types.h index 42fc6ed9815..1b08ef860a6 100644 --- a/include/asm-sparc/types.h +++ b/include/asm-sparc/types.h @@ -2,11 +2,6 @@ #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 @@ -14,23 +9,12 @@ * not a major issue. However, for interoperability, libraries still * need to be careful to avoid a name clashes. */ +#include #ifndef __ASSEMBLY__ typedef unsigned short umode_t; -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; - #endif /* __ASSEMBLY__ */ #ifdef __KERNEL__ @@ -39,18 +23,6 @@ typedef unsigned long long __u64; #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; - typedef u32 dma_addr_t; typedef u32 dma64_addr_t;