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

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

diff --git a/[refs] b/[refs]
index 4522fe7537c5..cb2cdc9e4fd1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e3b8cf047eb2702178b8cc16f03f8194af840732
+refs/heads/master: 8f337b5399302e41ed44e999e0cc518f92d0a509
diff --git a/trunk/include/asm-frv/types.h b/trunk/include/asm-frv/types.h
index 767e5ed71c4b..613bf1e962f0 100644
--- a/trunk/include/asm-frv/types.h
+++ b/trunk/include/asm-frv/types.h
@@ -12,29 +12,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__)
-__extension__ typedef __signed__ long long __s64;
-__extension__ typedef unsigned long long __u64;
-#endif
-
 #endif /* __ASSEMBLY__ */
 
 /*
@@ -46,19 +29,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;