Skip to content

Commit

Permalink
[PATCH] powerpc: merge include/asm-ppc*/statfs.h into include/asm-pow…
Browse files Browse the repository at this point in the history
…erpc/statfs.h

Signed-off-by: Kumar Gala <kumar.gala@freescale.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Kumar Gala authored and Paul Mackerras committed Sep 21, 2005
1 parent 8a4a10a commit e903c5b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 18 deletions.
19 changes: 9 additions & 10 deletions include/asm-ppc64/statfs.h → include/asm-powerpc/statfs.h
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -57,5 +56,5 @@ struct compat_statfs64 {
__u32 f_frsize;
__u32 f_spare[5];
};

#endif /* _PPC64_STATFS_H */
#endif /* ! __powerpc64__ */
#endif
8 changes: 0 additions & 8 deletions include/asm-ppc/statfs.h

This file was deleted.

0 comments on commit e903c5b

Please sign in to comment.