diff --git a/[refs] b/[refs]
index 408c1ce83783..0fc0847fbbef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8d286aa5eaf951bf53d4a0f64576d4b377c435ba
+refs/heads/master: 8191151d0933d65fb6b659ffbd765479f0f200e1
diff --git a/trunk/include/asm-ppc/fcntl.h b/trunk/include/asm-powerpc/fcntl.h
similarity index 77%
rename from trunk/include/asm-ppc/fcntl.h
rename to trunk/include/asm-powerpc/fcntl.h
index 7ef37443cc5c..ce5c4516d404 100644
--- a/trunk/include/asm-ppc/fcntl.h
+++ b/trunk/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/trunk/include/asm-ppc64/fcntl.h b/trunk/include/asm-ppc64/fcntl.h
deleted file mode 100644
index 6526023b59ff..000000000000
--- a/trunk/include/asm-ppc64/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-ppc/fcntl.h>