tree 130b2f505557808fb425484f54edbdf6aa824465 parent 8d286aa5eaf951bf53d4a0f64576d4b377c435ba author Stephen Rothwell <[EMAIL PROTECTED]> Wed, 07 Sep 2005 05:18:01 -0700 committer Linus Torvalds <[EMAIL PROTECTED]> Thu, 08 Sep 2005 06:57:39 -0700
[PATCH] Consolidate the asm-ppc*/fcntl.h files into asm-powerpc This makes sense now that we have asm-powerpc. Signed-off-by: Stephen Rothwell <[EMAIL PROTECTED]> Signed-off-by: Andrew Morton <[EMAIL PROTECTED]> Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]> include/asm-ppc/fcntl.h | 11 ----------- include/asm-ppc64/fcntl.h | 1 - include/asm-powerpc/fcntl.h | 11 +++++++++++ 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/include/asm-powerpc/fcntl.h b/include/asm-powerpc/fcntl.h new file mode 100644 --- /dev/null +++ b/include/asm-powerpc/fcntl.h @@ -0,0 +1,11 @@ +#ifndef _ASM_FCNTL_H +#define _ASM_FCNTL_H + +#define O_DIRECTORY 040000 /* must be a directory */ +#define O_NOFOLLOW 0100000 /* don't follow links */ +#define O_LARGEFILE 0200000 +#define O_DIRECT 0400000 /* direct disk access hint */ + +#include <asm-generic/fcntl.h> + +#endif /* _ASM_FCNTL_H */ diff --git a/include/asm-ppc/fcntl.h b/include/asm-ppc/fcntl.h deleted file mode 100644 --- a/include/asm-ppc/fcntl.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef _PPC_FCNTL_H -#define _PPC_FCNTL_H - -#define O_DIRECTORY 040000 /* must be a directory */ -#define O_NOFOLLOW 0100000 /* don't follow links */ -#define O_LARGEFILE 0200000 -#define O_DIRECT 0400000 /* direct disk access hint */ - -#include <asm-generic/fcntl.h> - -#endif /* _PPC_FCNTL_H */ diff --git a/include/asm-ppc64/fcntl.h b/include/asm-ppc64/fcntl.h deleted file mode 100644 --- a/include/asm-ppc64/fcntl.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-ppc/fcntl.h> - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html
