From: Geert Uytterhoeven <geert@linux-m68k.org>
ADB: Disable the ADB clock code when CONFIG_ADB is not selected (from Matthias
Urlichs).
arch/m68k/mac/misc.c | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff -puN arch/m68k/mac/misc.c~68k-364 arch/m68k/mac/misc.c
--- 25/arch/m68k/mac/misc.c~68k-364 2004-01-01 13:42:52.000000000 -0800
+++ 25-akpm/arch/m68k/mac/misc.c 2004-01-01 13:42:52.000000000 -0800
@@ -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 @@ static void adb_write_pram(int offset, _
(offset >> 8) & 0xFF, offset & 0xFF,
data);
}
+#endif /* CONFIG_ADB */
/*
* VIA PRAM/RTC access routines
@@ -356,7 +358,11 @@ void mac_pram_read(int offset, __u8 *buf
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 @@ void mac_pram_write(int offset, __u8 *bu
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 @@ int mac_hwclk(int op, struct rtc_time *t
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;
_