From 3c73faba28177c5639be3970e7936b23b8daa40c Mon Sep 17 00:00:00 2001
From: David Woodhouse <David.Woodhouse@intel.com>
Date: Mon, 1 Sep 2008 14:12:19 +0100
Subject: [PATCH] --- yaml --- r: 113633 b: refs/heads/master c:
 52d90f4dad1352a6077ad6e93650ecea9b258f56 h: refs/heads/master i:   113631:
 d82f6b3f73e8e64181242608a7da82a5be2e77fe v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/sparc/include/asm/Kbuild      |  2 -
 trunk/arch/sparc/include/asm/statfs.h    |  8 ++--
 trunk/arch/sparc/include/asm/statfs_32.h |  6 ---
 trunk/arch/sparc/include/asm/statfs_64.h | 54 ------------------------
 5 files changed, 4 insertions(+), 68 deletions(-)
 delete mode 100644 trunk/arch/sparc/include/asm/statfs_32.h
 delete mode 100644 trunk/arch/sparc/include/asm/statfs_64.h

diff --git a/[refs] b/[refs]
index 83d30cd8f030..41abd75b7621 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15e2fc9bbf946f999c78fe24cb1bc03c7256acab
+refs/heads/master: 52d90f4dad1352a6077ad6e93650ecea9b258f56
diff --git a/trunk/arch/sparc/include/asm/Kbuild b/trunk/arch/sparc/include/asm/Kbuild
index a5f0ce734ff7..3f1cb7ad0d67 100644
--- a/trunk/arch/sparc/include/asm/Kbuild
+++ b/trunk/arch/sparc/include/asm/Kbuild
@@ -15,8 +15,6 @@ header-y += signal_32.h
 header-y += signal_64.h
 header-y += stat_32.h
 header-y += stat_64.h
-header-y += statfs_32.h
-header-y += statfs_64.h
 header-y += unistd_32.h
 header-y += unistd_64.h
 
diff --git a/trunk/arch/sparc/include/asm/statfs.h b/trunk/arch/sparc/include/asm/statfs.h
index 5e937a73743d..55e607ad461d 100644
--- a/trunk/arch/sparc/include/asm/statfs.h
+++ b/trunk/arch/sparc/include/asm/statfs.h
@@ -1,8 +1,6 @@
 #ifndef ___ASM_SPARC_STATFS_H
 #define ___ASM_SPARC_STATFS_H
-#if defined(__sparc__) && defined(__arch64__)
-#include <asm/statfs_64.h>
-#else
-#include <asm/statfs_32.h>
-#endif
+
+#include <asm-generic/statfs.h>
+
 #endif
diff --git a/trunk/arch/sparc/include/asm/statfs_32.h b/trunk/arch/sparc/include/asm/statfs_32.h
deleted file mode 100644
index 304520fa8863..000000000000
--- a/trunk/arch/sparc/include/asm/statfs_32.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _SPARC_STATFS_H
-#define _SPARC_STATFS_H
-
-#include <asm-generic/statfs.h>
-
-#endif
diff --git a/trunk/arch/sparc/include/asm/statfs_64.h b/trunk/arch/sparc/include/asm/statfs_64.h
deleted file mode 100644
index 79b3c890a5fa..000000000000
--- a/trunk/arch/sparc/include/asm/statfs_64.h
+++ /dev/null
@@ -1,54 +0,0 @@
-#ifndef _SPARC64_STATFS_H
-#define _SPARC64_STATFS_H
-
-#ifndef __KERNEL_STRICT_NAMES
-
-#include <linux/types.h>
-
-typedef __kernel_fsid_t	fsid_t;
-
-#endif
-
-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;
-	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 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];
-};
-
-#endif