From 89e8455d2ce1c30408b7b8d8347d6191245c8c32 Mon Sep 17 00:00:00 2001
From: "H. Peter Anvin" <hpa@zytor.com>
Date: Sun, 6 Apr 2008 10:35:09 -0700
Subject: [PATCH] --- yaml --- r: 95933 b: refs/heads/master c:
 849bf3a09fdcf9dbbe060da0f5bce90231b14625 h: refs/heads/master i:   95931:
 b99e09b810476547e059ae69ed8a2b3ee31b39d7 v: v3

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

diff --git a/[refs] b/[refs]
index 870386022bb8..e55fcb7f5107 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8523437b4c664cfc0f11998c4274846b95182000
+refs/heads/master: 849bf3a09fdcf9dbbe060da0f5bce90231b14625
diff --git a/trunk/include/asm-parisc/types.h b/trunk/include/asm-parisc/types.h
index 56c84802da59..7f5a39bfb4ce 100644
--- a/trunk/include/asm-parisc/types.h
+++ b/trunk/include/asm-parisc/types.h
@@ -1,29 +1,12 @@
 #ifndef _PARISC_TYPES_H
 #define _PARISC_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__ */
 
 /*
@@ -41,18 +24,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;