diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2005-09-06 18:18:01 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 19:57:39 -0400 |
| commit | 8191151d0933d65fb6b659ffbd765479f0f200e1 (patch) | |
| tree | 130b2f505557808fb425484f54edbdf6aa824465 /include | |
| parent | 8d286aa5eaf951bf53d4a0f64576d4b377c435ba (diff) | |
[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>
Diffstat (limited to 'include')
| -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 @@ | |||
| 1 | #ifndef _PPC_FCNTL_H | 1 | #ifndef _ASM_FCNTL_H |
| 2 | #define _PPC_FCNTL_H | 2 | #define _ASM_FCNTL_H |
| 3 | 3 | ||
| 4 | #define O_DIRECTORY 040000 /* must be a directory */ | 4 | #define O_DIRECTORY 040000 /* must be a directory */ |
| 5 | #define O_NOFOLLOW 0100000 /* don't follow links */ | 5 | #define O_NOFOLLOW 0100000 /* don't follow links */ |
| @@ -8,4 +8,4 @@ | |||
| 8 | 8 | ||
| 9 | #include <asm-generic/fcntl.h> | 9 | #include <asm-generic/fcntl.h> |
| 10 | 10 | ||
| 11 | #endif /* _PPC_FCNTL_H */ | 11 | #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 @@ | |||
| 1 | #include <asm-ppc/fcntl.h> | ||