From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 6 Sep 2005 22:18:01 +0000 (-0700)
Subject: [PATCH] Consolidate the asm-ppc*/fcntl.h files into asm-powerpc
X-Git-Tag: v2.6.14-rc1~647
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8191151d0933d65fb6b659ffbd765479f0f200e1;p=linux-2.6-omap-h63xx.git

[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>
---

diff --git a/include/asm-ppc/fcntl.h b/include/asm-powerpc/fcntl.h
similarity index 77%
rename from include/asm-ppc/fcntl.h
rename to include/asm-powerpc/fcntl.h
index 7ef37443cc5..ce5c4516d40 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 6526023b59f..00000000000
--- a/include/asm-ppc64/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-ppc/fcntl.h>