From 102f3bc2590db2083fd957f8d59904c38a3ec069 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 6 Sep 2005 15:18:01 -0700
Subject: [PATCH] --- yaml --- r: 7415 b: refs/heads/master c:
 8191151d0933d65fb6b659ffbd765479f0f200e1 h: refs/heads/master i:   7413:
 74c00f8f07633f9fdece570656c9e655b2684bb5   7411:
 c912d53b416cfa83d01864ca9891ba0a8685d7c8   7407:
 4071ce008d9adfd90bdbb69a6e3ee54873030842 v: v3

---
 [refs]                                         | 2 +-
 trunk/include/{asm-ppc => asm-powerpc}/fcntl.h | 6 +++---
 trunk/include/asm-ppc64/fcntl.h                | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename trunk/include/{asm-ppc => asm-powerpc}/fcntl.h (77%)
 delete mode 100644 trunk/include/asm-ppc64/fcntl.h

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>