cleanup after APUS removal

After the APUS removal, some code can be removed.

Signed-off-by: Adrian Bunk <[email protected]>
Acked-by: Geert Uytterhoeven <[email protected]>
Cc: Bartlomiej Zolnierkiewicz <[email protected]>
Cc: Karsten Keil <[email protected]>
Cc: James Bottomley <[email protected]>
Cc: "Antonino A. Daplas" <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
Adrian Bunk 2008-02-06 01:36:29 -08:00 • committed by Linus Torvalds
commit 7b892806b0
11 changed files with 10 additions and 29 deletions

View file

@ -84,7 +84,7 @@
#ifdef CONFIG_MAC
#include <asm/macints.h>
#endif
#if defined(__mc68000__) || defined(CONFIG_APUS)
#if defined(__mc68000__)
#include <asm/machdep.h>
#include <asm/setup.h>
#endif

View file

@ -15,7 +15,7 @@
#include <linux/module.h>
#include <linux/types.h>
#include <linux/string.h>
#if defined(__mc68000__) || defined(CONFIG_APUS)
#if defined(__mc68000__)
#include <asm/setup.h>
#endif
#include <linux/font.h>
@ -120,7 +120,7 @@ const struct font_desc *get_default_font(int xres, int yres, u32 font_w,
for(i=0; i<num_fonts; i++) {
f = fonts[i];
c = f->pref;
#if defined(__mc68000__) || defined(CONFIG_APUS)
#if defined(__mc68000__)
#ifdef CONFIG_FONT_PEARL_8x8
if (MACH_IS_AMIGA && f->idx == PEARL8x8_IDX)
c = 100;