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

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

diff --git a/[refs] b/[refs]
index 672f5b847ed7..870386022bb8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23cf11ddb5099f8c7f7cb3eb154bff0faf31cae9
+refs/heads/master: 8523437b4c664cfc0f11998c4274846b95182000
diff --git a/trunk/include/asm-mn10300/types.h b/trunk/include/asm-mn10300/types.h
index d40ea7628bfc..7b9f01042fd4 100644
--- a/trunk/include/asm-mn10300/types.h
+++ b/trunk/include/asm-mn10300/types.h
@@ -11,29 +11,12 @@
 #ifndef _ASM_TYPES_H
 #define _ASM_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__) && !defined(__STRICT_ANSI__)
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
-#endif
-
 #endif /* __ASSEMBLY__ */
 
 /*
@@ -45,18 +28,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;
-
 /* Dma addresses are 32-bits wide.  */
 typedef u32 dma_addr_t;