diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-07 00:18:01 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 01:57:39 +0200 |
| commit | 8191151d0933d65fb6b659ffbd765479f0f200e1 (patch) | |
| tree | 130b2f505557808fb425484f54edbdf6aa824465 | |
| parent | [PATCH] Clean up struct flock64 definitions (diff) | |
| download | linux-8191151d0933d65fb6b659ffbd765479f0f200e1.tar.xz linux-8191151d0933d65fb6b659ffbd765479f0f200e1.zip | |
[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 <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | include/asm-powerpc/fcntl.h (renamed from include/asm-ppc/fcntl.h) | 6 | ||||
| -rw-r--r-- | include/asm-ppc64/fcntl.h | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-ppc/fcntl.h b/include/asm-powerpc/fcntl.h index 7ef37443cc5c..ce5c4516d404 100644 --- a/include/asm-ppc/fcntl.h +++ b/include/asm-powerpc/fcntl.h @@ -1,5 +1,5 @@ -#ifndef _PPC_FCNTL_H -#define _PPC_FCNTL_H +#ifndef _ASM_FCNTL_H +#define _ASM_FCNTL_H #define O_DIRECTORY 040000 /* must be a directory */ #define O_NOFOLLOW 0100000 /* don't follow links */ @@ -8,4 +8,4 @@ #include <asm-generic/fcntl.h> -#endif /* _PPC_FCNTL_H */ +#endif /* _ASM_FCNTL_H */ diff --git a/include/asm-ppc64/fcntl.h b/include/asm-ppc64/fcntl.h deleted file mode 100644 index 6526023b59ff..000000000000 --- a/include/asm-ppc64/fcntl.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-ppc/fcntl.h> |