[PATCH] Consolidate the asm-ppc*/fcntl.h files into asm-powerpc

This makes sense now that we have asm-powerpc.
Signed-off-by: NStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>

include/asm-ppc/fcntl.h → include/asm-powerpc/fcntl.h

-#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 */

include/asm-ppc64/fcntl.h

-#include <asm-ppc/fcntl.h>