From ee78d78bcf462f4f7372273ffa7d658cb129a755 Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Tue, 20 Jan 2009 17:50:51 -0800
Subject: [PATCH] --- yaml --- r: 130092 b: refs/heads/master c:
 6aeea60aee945449c93d9aa70638deeb5c4c5439 h: refs/heads/master v: v3

---
 [refs]                                     |  2 +-
 trunk/arch/m68k/include/asm/byteorder.h    | 11 ++++++-----
 trunk/arch/m68k/include/asm/byteorder_mm.h |  6 ------
 trunk/arch/m68k/include/asm/byteorder_no.h |  6 ------
 trunk/arch/m68k/include/asm/swab.h         |  5 +++++
 5 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 trunk/arch/m68k/include/asm/byteorder_mm.h
 delete mode 100644 trunk/arch/m68k/include/asm/byteorder_no.h

diff --git a/[refs] b/[refs]
index 7ef681440eaa..6b6a85504348 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac3d266bf1bbbdd7efb6bd6760f2ee29e43bb132
+refs/heads/master: 6aeea60aee945449c93d9aa70638deeb5c4c5439
diff --git a/trunk/arch/m68k/include/asm/byteorder.h b/trunk/arch/m68k/include/asm/byteorder.h
index f20502a001f5..31b260a88803 100644
--- a/trunk/arch/m68k/include/asm/byteorder.h
+++ b/trunk/arch/m68k/include/asm/byteorder.h
@@ -1,5 +1,6 @@
-#ifdef __uClinux__
-#include "byteorder_no.h"
-#else
-#include "byteorder_mm.h"
-#endif
+#ifndef _M68K_BYTEORDER_H
+#define _M68K_BYTEORDER_H
+
+#include <linux/byteorder/big_endian.h>
+
+#endif /* _M68K_BYTEORDER_H */
diff --git a/trunk/arch/m68k/include/asm/byteorder_mm.h b/trunk/arch/m68k/include/asm/byteorder_mm.h
deleted file mode 100644
index 31b260a88803..000000000000
--- a/trunk/arch/m68k/include/asm/byteorder_mm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _M68K_BYTEORDER_H
-#define _M68K_BYTEORDER_H
-
-#include <linux/byteorder/big_endian.h>
-
-#endif /* _M68K_BYTEORDER_H */
diff --git a/trunk/arch/m68k/include/asm/byteorder_no.h b/trunk/arch/m68k/include/asm/byteorder_no.h
deleted file mode 100644
index 9c6c76a15041..000000000000
--- a/trunk/arch/m68k/include/asm/byteorder_no.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _M68KNOMMU_BYTEORDER_H
-#define _M68KNOMMU_BYTEORDER_H
-
-#include <linux/byteorder/big_endian.h>
-
-#endif /* _M68KNOMMU_BYTEORDER_H */
diff --git a/trunk/arch/m68k/include/asm/swab.h b/trunk/arch/m68k/include/asm/swab.h
index e69de29bb2d1..7d7dde1c73ec 100644
--- a/trunk/arch/m68k/include/asm/swab.h
+++ b/trunk/arch/m68k/include/asm/swab.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "swab_no.h"
+#else
+#include "swab_mm.h"
+#endif