dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Greg Ungerer 2009-02-06 14:45:23 +10:00
parent dbc367eb69
commit 76adcb2e81
3 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/m68k/include/asm/bugs.h
View File

@ -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

14
arch/m68k/include/asm/bugs_mm.h
View File

@ -1,14 +0,0 @@
/*
* 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);
*/
extern void check_bugs(void); /* in arch/m68k/kernel/setup.c */

16
arch/m68k/include/asm/bugs_no.h
View File

@ -1,16 +0,0 @@
/*
* 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);
*/
static void check_bugs(void)
{
}