m68k: remove old mac_esp cruft
Remove the rest of the old mac_esp driver. Also ditch the rest of the machw mechanism, it needs to be replaced by a fake openfirmware tree. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:

committed by
Linus Torvalds

parent
3b17f136bf
commit
b6d9d267f0
@@ -48,9 +48,6 @@
|
||||
struct mac_booter_data mac_bi_data;
|
||||
int mac_bisize = sizeof mac_bi_data;
|
||||
|
||||
struct mac_hw_present mac_hw_present;
|
||||
EXPORT_SYMBOL(mac_hw_present);
|
||||
|
||||
/* New m68k bootinfo stuff and videobase */
|
||||
|
||||
extern int m68k_num_memory;
|
||||
@@ -817,27 +814,6 @@ void __init mac_identify(void)
|
||||
m68k_ramdisk.addr, m68k_ramdisk.size);
|
||||
#endif
|
||||
|
||||
/*
|
||||
* TODO: set the various fields in macintosh_config->hw_present here!
|
||||
*/
|
||||
switch (macintosh_config->scsi_type) {
|
||||
case MAC_SCSI_OLD:
|
||||
MACHW_SET(MAC_SCSI_80);
|
||||
break;
|
||||
case MAC_SCSI_QUADRA:
|
||||
case MAC_SCSI_QUADRA2:
|
||||
case MAC_SCSI_QUADRA3:
|
||||
MACHW_SET(MAC_SCSI_96);
|
||||
if ((macintosh_config->ident == MAC_MODEL_Q900) ||
|
||||
(macintosh_config->ident == MAC_MODEL_Q950))
|
||||
MACHW_SET(MAC_SCSI_96_2);
|
||||
break;
|
||||
default:
|
||||
printk(KERN_WARNING "config.c: wtf: unknown scsi, using 53c80\n");
|
||||
MACHW_SET(MAC_SCSI_80);
|
||||
break;
|
||||
}
|
||||
|
||||
iop_init();
|
||||
via_init();
|
||||
oss_init();
|
||||
|
Reference in New Issue
Block a user