From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Linus Torvalds <torvalds@osdl.org>, Andrew Morton <akpm@osdl.org>
Cc: Linux Kernel Development <linux-kernel@vger.kernel.org>,
Geert Uytterhoeven <geert@linux-m68k.org>
Subject: [PATCH 364] Mac ADB
Date: Thu, 1 Jan 2004 21:02:01 +0100 [thread overview]
Message-ID: <200401012002.i01K21pa031811@callisto.of.borg> (raw)
ADB: Disable the ADB clock code when CONFIG_ADB is not selected (from Matthias
Urlichs).
--- linux-2.6.0/arch/m68k/mac/misc.c 2003-01-02 12:53:57.000000000 +0100
+++ linux-m68k-2.6.0/arch/m68k/mac/misc.c 2003-11-03 20:49:30.000000000 +0100
@@ -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 -- geert@linux-m68k.org
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
reply other threads:[~2004-01-01 20:17 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200401012002.i01K21pa031811@callisto.of.borg \
--to=geert@linux-m68k.org \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®