From d82f6b3f73e8e64181242608a7da82a5be2e77fe Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Mon, 1 Sep 2008 14:11:27 +0100
Subject: [PATCH] --- yaml --- r: 113631 b: refs/heads/master c:
 5c14dd061a40ff05e00a6c8dbf097b334e6bbea0 h: refs/heads/master i:   113629:
 54e4c9115894957f8ab34a530851fe9ebebc4172   113627:
 4c9d2100920b5abadb74e549cdfcbd373473edd9   113623:
 922a144af6f68512a660261570262d01ec907b48   113615:
 f11c1a3c7847bf48a812eb7eb79a071e772d9973   113599:
 d366e2e12f5b097c169856f13cbd595db60f0ff0 v: v3

---
 [refs]                            |  2 +-
 trunk/include/asm-parisc/statfs.h | 55 ++-----------------------------
 2 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/[refs] b/[refs]
index e117e3fb4d1a..9228801cfb02 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96bf7adbaed24da0293dd87466e27b4151ae9da8
+refs/heads/master: 5c14dd061a40ff05e00a6c8dbf097b334e6bbea0
diff --git a/trunk/include/asm-parisc/statfs.h b/trunk/include/asm-parisc/statfs.h
index 1d2b8130b23d..324bea905dc6 100644
--- a/trunk/include/asm-parisc/statfs.h
+++ b/trunk/include/asm-parisc/statfs.h
@@ -1,58 +1,7 @@
 #ifndef _PARISC_STATFS_H
 #define _PARISC_STATFS_H
 
-#ifndef __KERNEL_STRICT_NAMES
-
-#include <linux/types.h>
-
-typedef __kernel_fsid_t	fsid_t;
-
-#endif
-
-/*
- * It appears that PARISC could be 64 _or_ 32 bit.
- * 64-bit fields must be explicitly 64-bit in statfs64.
- */
-struct statfs {
-	long f_type;
-	long f_bsize;
-	long f_blocks;
-	long f_bfree;
-	long f_bavail;
-	long f_files;
-	long f_ffree;
-	__kernel_fsid_t f_fsid;
-	long f_namelen;
-	long f_frsize;
-	long f_spare[5];
-};
-
-struct statfs64 {
-	long f_type;
-	long f_bsize;
-	__u64 f_blocks;
-	__u64 f_bfree;
-	__u64 f_bavail;
-	__u64 f_files;
-	__u64 f_ffree;
-	__kernel_fsid_t f_fsid;
-	long f_namelen;
-	long f_frsize;
-	long f_spare[5];
-};
-
-struct compat_statfs64 {
-	__u32 f_type;
-	__u32 f_bsize;
-	__u64 f_blocks;
-	__u64 f_bfree;
-	__u64 f_bavail;
-	__u64 f_files;
-	__u64 f_ffree;
-	__kernel_fsid_t f_fsid;
-	__u32 f_namelen;
-	__u32 f_frsize;
-	__u32 f_spare[5];
-};
+#define __statfs_word long
+#include <asm-generic/statfs.h>
 
 #endif