diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2009-02-06 14:45:23 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2009-03-24 15:17:45 +1000 |
| commit | 76adcb2e812464c38b42f18ab76e78e71df40464 (patch) | |
| tree | cf8bfa38dae54f52ad9216b18b2e6d39aeb121b8 /arch/m68k/include/asm/bugs.h | |
| parent | dbc367eb69cedf47c702310e4abe1514d52abb4b (diff) | |
m68k: merge the mmu and non-mmu versions of bugs.h
Trivial merge of the mmu and non-mmu versions of bugs.h
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/include/asm/bugs.h')
| -rw-r--r-- | arch/m68k/include/asm/bugs.h | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/arch/m68k/include/asm/bugs.h b/arch/m68k/include/asm/bugs.h index 01f047d784ec..d06207b9ba5a 100644 --- a/arch/m68k/include/asm/bugs.h +++ b/arch/m68k/include/asm/bugs.h @@ -1,5 +1,20 @@ -#ifdef __uClinux__ -#include "bugs_no.h" +/* + * include/asm-m68k/bugs.h + * + * Copyright (C) 1994 Linus Torvalds + */ + +/* + * This is included by init/main.c to check for architecture-dependent bugs. + * + * Needs: + * void check_bugs(void); + */ + +#ifdef CONFIG_MMU +extern void check_bugs(void); /* in arch/m68k/kernel/setup.c */ #else -#include "bugs_mm.h" +static void check_bugs(void) +{ +} #endif |