Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 76adcb2e authored by Greg Ungerer's avatar Greg Ungerer
Browse files

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: default avatarGreg Ungerer <gerg@uclinux.org>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
parent dbc367eb

arch/m68k/include/asm/bugs.h

+18 −3
Original line number Diff line number Diff line 
#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

arch/m68k/include/asm/bugs_mm.h

deleted100644 → 0
+0 −14
Original line number Diff line number Diff line 
/*

 *  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 */

arch/m68k/include/asm/bugs_no.h

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
/*

 *  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)

{

}