From a8d890ad6e5f4f342aed609e88f9a9cdc0845a8f Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Sun, 6 Apr 2008 10:35:11 -0700
Subject: [PATCH] --- yaml --- r: 95936 b: refs/heads/master c:
 ba6677886e46adcd075f251d8971debf7b5ca3ee h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/include/asm-sh/types.h | 34 ++--------------------------------
 2 files changed, 3 insertions(+), 33 deletions(-)

diff --git a/[refs] b/[refs]
index 0b229c3675ab..7b4c5ee66eb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 59df83992b6ec962fdf69e4db4c18951499cc67c
+refs/heads/master: ba6677886e46adcd075f251d8971debf7b5ca3ee
diff --git a/trunk/include/asm-sh/types.h b/trunk/include/asm-sh/types.h
index a6e1d4126e67..beea4e6f8dfd 100644
--- a/trunk/include/asm-sh/types.h
+++ b/trunk/include/asm-sh/types.h
@@ -1,29 +1,12 @@
 #ifndef __ASM_SH_TYPES_H
 #define __ASM_SH_TYPES_H
 
+#include <asm-generic/int-ll64.h>
+
 #ifndef __ASSEMBLY__
 
 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;
-
-#if defined(__GNUC__)
-__extension__ typedef __signed__ long long __s64;
-__extension__ typedef unsigned long long __u64;
-#endif
-
 #endif /* __ASSEMBLY__ */
 
 /*
@@ -35,19 +18,6 @@ __extension__ 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;
-
 /* Dma addresses are 32-bits wide.  */
 
 typedef u32 dma_addr_t;