Commit e903c5b5 authored by Kumar Gala's avatar Kumar Gala Committed by Paul Mackerras
Browse files

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



Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 8a4a10ae

include/asm-ppc64/statfs.h→include/asm-powerpc/statfs.h

+9 −10
Original line number Diff line number Diff line 
#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

include/asm-ppc/statfs.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
#ifndef _PPC_STATFS_H

#define _PPC_STATFS_H



#include <asm-generic/statfs.h>

#endif