From: Harvey Harrison <harvey.harrison@gmail.com>
To: Greg Ungerer <gerg@snapgear.com>
Cc: torvalds@linux-foundation.org, arnd@arndb.de, gerg@uclinux.org,
linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-m68k@vger.kernel.org, sam@ravnborg.org,
uclinux-dev@uclinux.org, zippel@linux-m68k.org
Subject: [PATCH] m68k{nommu}: fixups after the header move
Date: Tue, 20 Jan 2009 17:50:51 -0800 [thread overview]
Message-ID: <1232502651.9701.0.camel@brick> (raw)
In-Reply-To: <1232502275.5653.2.camel@brick>
swab.h seems to have been missed during the header merge.
Add conditionals similar to byteorder.h and remove the
now unnecessary byteorder_no/mm.h
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
arch/m68k/include/asm/byteorder.h | 11 ++++++-----
arch/m68k/include/asm/byteorder_mm.h | 6 ------
arch/m68k/include/asm/byteorder_no.h | 6 ------
arch/m68k/include/asm/swab.h | 5 +++++
4 files changed, 11 insertions(+), 17 deletions(-)
diff --git a/arch/m68k/include/asm/byteorder.h b/arch/m68k/include/asm/byteorder.h
index f20502a..31b260a 100644
--- a/arch/m68k/include/asm/byteorder.h
+++ b/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/arch/m68k/include/asm/byteorder_mm.h b/arch/m68k/include/asm/byteorder_mm.h
deleted file mode 100644
index 31b260a..0000000
--- a/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/arch/m68k/include/asm/byteorder_no.h b/arch/m68k/include/asm/byteorder_no.h
deleted file mode 100644
index 9c6c76a..0000000
--- a/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/arch/m68k/include/asm/swab.h b/arch/m68k/include/asm/swab.h
index e69de29..7d7dde1 100644
--- a/arch/m68k/include/asm/swab.h
+++ b/arch/m68k/include/asm/swab.h
@@ -0,0 +1,5 @@
+#ifdef __uClinux__
+#include "swab_no.h"
+#else
+#include "swab_mm.h"
+#endif
--
1.6.1.249.g455e5
next prev parent reply other threads:[~2009-01-21 1:51 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-21 0:58 [git pull] m68k and m68knommu merge of includes Greg Ungerer
2009-01-21 1:44 ` Harvey Harrison
2009-01-21 1:50 ` Harvey Harrison [this message]
2009-01-21 3:38 ` Greg Ungerer
2009-01-21 3:49 ` Harvey Harrison
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1232502651.9701.0.camel@brick \
--to=harvey.harrison@gmail.com \
--cc=arnd@arndb.de \
--cc=gerg@snapgear.com \
--cc=gerg@uclinux.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@vger.kernel.org \
--cc=sam@ravnborg.org \
--cc=torvalds@linux-foundation.org \
--cc=uclinux-dev@uclinux.org \
--cc=zippel@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox