lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] powerpc: merge include/asm-ppc*/statfs.h into include/asm-powerpc/statfs.h

Browse Source 
Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Kumar Gala
2005-09-20 16:49:51 -05:00
committed by Paul Mackerras
parent 8a4a10ae99
commit e903c5b536
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/asm-ppc64/statfs.h → include/asm-powerpc/statfs.h
View File

@@ -1,12 +1,11 @@
#ifndef _PPC64_STATFS_H #ifndef _ASM_POWERPC_STATFS_H
#define _PPC64_STATFS_H #define _ASM_POWERPC_STATFS_H
/* /* For ppc32 we just use the generic definitions, not so simple on ppc64 */
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License #ifndef __powerpc64__
* as published by the Free Software Foundation; either version #include <asm-generic/statfs.h>
* 2 of the License, or (at your option) any later version. #else
*/
#ifndef __KERNEL_STRICT_NAMES #ifndef __KERNEL_STRICT_NAMES
#include <linux/types.h> #include <linux/types.h>
@@ -57,5 +56,5 @@ struct compat_statfs64 {
__u32 f_frsize; __u32 f_frsize;
__u32 f_spare[5]; __u32 f_spare[5];
}; };
#endif /* ! __powerpc64__ */
#endif /* _PPC64_STATFS_H */ #endif

8
include/asm-ppc/statfs.h
View File

@@ -1,8 +0,0 @@
#ifndef _PPC_STATFS_H
#define _PPC_STATFS_H
#include <asm-generic/statfs.h>
#endif