summaryrefslogtreecommitdiffstats
path: root/arch/m68k/include/asm/bug_no.h
diff options
context:
space:
mode:
authorGreg Ungerer <gerg@uclinux.org>2009-02-06 14:44:11 +1000
committerGreg Ungerer <gerg@uclinux.org>2009-03-24 15:17:44 +1000
commitdbc367eb69cedf47c702310e4abe1514d52abb4b (patch)
treef61d49e8b29464fa48d121a8d414b413e8218de5 /arch/m68k/include/asm/bug_no.h
parentb0ffbf26124563fa17ef5a35266ee8e3f3ab2b91 (diff)
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 <gerg@uclinux.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/bug_no.h')
-rw-r--r--arch/m68k/include/asm/bug_no.h4
1 files changed, 0 insertions, 4 deletions
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 <asm-generic/bug.h>
-#endif