From dbc367eb69cedf47c702310e4abe1514d52abb4b Mon Sep 17 00:00:00 2001 From: Greg Ungerer Date: Fri, 6 Feb 2009 14:44:11 +1000 Subject: [PATCH] m68k: merge the mmu and non-mmu versions of bug.h Trivial merge of the mmu and non-mmu versions of bug.h Signed-off-by: Greg Ungerer Acked-by: Geert Uytterhoeven --- arch/m68k/include/asm/{bug_mm.h => bug.h} | 3 ++- arch/m68k/include/asm/bug_no.h | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) rename arch/m68k/include/asm/{bug_mm.h => bug.h} (91%) delete mode 100644 arch/m68k/include/asm/bug_no.h diff --git a/arch/m68k/include/asm/bug_mm.h b/arch/m68k/include/asm/bug.h similarity index 91% rename from arch/m68k/include/asm/bug_mm.h rename to arch/m68k/include/asm/bug.h index e5b528deb8a..ef9a2e47352 100644 --- a/arch/m68k/include/asm/bug_mm.h +++ b/arch/m68k/include/asm/bug.h @@ -1,7 +1,7 @@ #ifndef _M68K_BUG_H #define _M68K_BUG_H - +#ifdef CONFIG_MMU #ifdef CONFIG_BUG #ifdef CONFIG_DEBUG_BUGVERBOSE #ifndef CONFIG_SUN3 @@ -23,6 +23,7 @@ #define HAVE_ARCH_BUG #endif +#endif /* CONFIG_MMU */ #include diff --git a/arch/m68k/include/asm/bug_no.h b/arch/m68k/include/asm/bug_no.h deleted file mode 100644 index 70e7dc0af21..00000000000 --- a/arch/m68k/include/asm/bug_no.h +++ /dev/null @@ -1,4 +0,0 @@ -#ifndef _M68KNOMMU_BUG_H -#define _M68KNOMMU_BUG_H -#include -#endif -- 2.11.4.GIT