patch-2.4.25 linux-2.4.25/arch/m68k/mac/misc.c
Next file: linux-2.4.25/arch/m68k/math-emu/multi_arith.h
Previous file: linux-2.4.25/arch/m68k/mac/mac_ksyms.c
Back to the patch index
Back to the overall index
- Lines: 59
- Date:
2004-02-18 05:36:30.000000000 -0800
- Orig file:
linux-2.4.24/arch/m68k/mac/misc.c
- Orig date:
2002-11-28 15:53:09.000000000 -0800
diff -urN linux-2.4.24/arch/m68k/mac/misc.c linux-2.4.25/arch/m68k/mac/misc.c
@@ -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
@@ -357,7 +359,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;
}
@@ -375,7 +381,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;
}
@@ -602,12 +612,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;
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)