From 6aeea60aee945449c93d9aa70638deeb5c4c5439 Mon Sep 17 00:00:00 2001 From: Harvey Harrison Date: Tue, 20 Jan 2009 17:50:51 -0800 Subject: [PATCH] m68k{nommu}: fixups after the header move 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 Signed-off-by: Linus Torvalds --- 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(-) delete mode 100644 arch/m68k/include/asm/byteorder_mm.h delete mode 100644 arch/m68k/include/asm/byteorder_no.h diff --git a/arch/m68k/include/asm/byteorder.h b/arch/m68k/include/asm/byteorder.h index f20502a001f5..31b260a88803 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 + +#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 31b260a88803..000000000000 --- a/arch/m68k/include/asm/byteorder_mm.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _M68K_BYTEORDER_H -#define _M68K_BYTEORDER_H - -#include - -#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 9c6c76a15041..000000000000 --- a/arch/m68k/include/asm/byteorder_no.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _M68KNOMMU_BYTEORDER_H -#define _M68KNOMMU_BYTEORDER_H - -#include - -#endif /* _M68KNOMMU_BYTEORDER_H */ diff --git a/arch/m68k/include/asm/swab.h b/arch/m68k/include/asm/swab.h index e69de29bb2d1..7d7dde1c73ec 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 -- 2.11.0