From 3b62d505fd35030e5448d2d83031c643d072847f Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Sun, 6 Apr 2008 10:35:12 -0700
Subject: [PATCH] --- yaml --- r: 95937 b: refs/heads/master c:
 a3727dc6c21cd0bed64dbc97212c39d2b391f5af h: refs/heads/master i:   95935:
 4402509bcf1cc4f1afb7cee38f3e45f7cfe14804 v: v3

---
 [refs]                          |  2 +-
 trunk/include/asm-sparc/types.h | 30 +-----------------------------
 2 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index 7b4c5ee66eb3..dc943eb4b9a6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba6677886e46adcd075f251d8971debf7b5ca3ee
+refs/heads/master: a3727dc6c21cd0bed64dbc97212c39d2b391f5af
diff --git a/trunk/include/asm-sparc/types.h b/trunk/include/asm-sparc/types.h
index 42fc6ed98156..1b08ef860a66 100644
--- a/trunk/include/asm-sparc/types.h
+++ b/trunk/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 <asm-generic/int-ll64.h>
 
 #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;