Mac ADB
Subsystems (2)
Geert Uytterhoeven
maintainerPATCH 1/1 Mac ADB
ADB: Disable the ADB clock code when CONFIG_ADB is not selected (from Matthias Urlichs).
arch/m68k/mac/misc.c +16 -2
@@ -39,6 +39,7 @@extern struct mac_booter_data mac_bi_data;static void (*rom_reset)(void ); +#ifdef CONFIG_ADB /* * Return the current time as the number of seconds since January 1, 1904. */
@@ -103,6 +104,7 @@ (offset >>8 ) &0xFF , offset &0xFF , data); } +#endif /* CONFIG_ADB */ /* * VIA PRAM/RTC access routines
@@ -356,7 +358,11 @@ macintosh_config->adb_type == MAC_ADB_PB1 || macintosh_config->adb_type == MAC_ADB_PB2 || macintosh_config->adb_type == MAC_ADB_CUDA) { +#ifdef CONFIG_ADB func = adb_read_pram; +#else + return; +#endif } else { func = via_read_pram; }
@@ -374,7 +380,11 @@ macintosh_config->adb_type == MAC_ADB_PB1 || macintosh_config->adb_type == MAC_ADB_PB2 || macintosh_config->adb_type == MAC_ADB_CUDA) { +#ifdef CONFIG_ADB func = adb_write_pram; +#else + return; +#endif } else { func = via_write_pram; }
@@ -580,12 +590,16 @@if (!op) {/* read */ if (macintosh_config->adb_type ==MAC_ADB_II ) { now =via_read_time (); - }else if ((macintosh_config->adb_type ==MAC_ADB_IISI ) || + } else +#ifdef CONFIG_ADB +if ((macintosh_config->adb_type ==MAC_ADB_IISI ) || (macintosh_config->adb_type ==MAC_ADB_PB1 ) || (macintosh_config->adb_type ==MAC_ADB_PB2 ) || (macintosh_config->adb_type ==MAC_ADB_CUDA )) { now =adb_read_time (); - }else if (macintosh_config->adb_type ==MAC_ADB_IOP ) { + } else +#endif +if (macintosh_config->adb_type ==MAC_ADB_IOP ) { now =via_read_time (); }else { now =0 ;
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds