[PATCH] powerpc: merge include/asm-ppc*/statfs.h into include/asm-powerpc/statfs.h
Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
parent
8a4a10ae99
commit
e903c5b536
|
@ -1,12 +1,11 @@
|
|||
#ifndef _PPC64_STATFS_H
|
||||
#define _PPC64_STATFS_H
|
||||
#ifndef _ASM_POWERPC_STATFS_H
|
||||
#define _ASM_POWERPC_STATFS_H
|
||||
|
||||
/*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License
|
||||
* as published by the Free Software Foundation; either version
|
||||
* 2 of the License, or (at your option) any later version.
|
||||
*/
|
||||
/* For ppc32 we just use the generic definitions, not so simple on ppc64 */
|
||||
|
||||
#ifndef __powerpc64__
|
||||
#include <asm-generic/statfs.h>
|
||||
#else
|
||||
|
||||
#ifndef __KERNEL_STRICT_NAMES
|
||||
#include <linux/types.h>
|
||||
|
@ -57,5 +56,5 @@ struct compat_statfs64 {
|
|||
__u32 f_frsize;
|
||||
__u32 f_spare[5];
|
||||
};
|
||||
|
||||
#endif /* _PPC64_STATFS_H */
|
||||
#endif /* ! __powerpc64__ */
|
||||
#endif
|
|
@ -1,8 +0,0 @@
|
|||
#ifndef _PPC_STATFS_H
|
||||
#define _PPC_STATFS_H
|
||||
|
||||
#include <asm-generic/statfs.h>
|
||||
#endif
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user