lkml.org 
[lkml]   [2003]   [Dec]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Date
From
Subject[PATCH 133] Mac ADB
ADB: Disable the ADB clock code when CONFIG_ADB is not selected (from Matthias
Urlichs in 2.6.0).

--- linux-2.4.23/arch/m68k/mac/misc.c 2002-09-13 10:15:02.000000000 +0200
+++ linux-m68k-2.4.23/arch/m68k/mac/misc.c 2003-11-03 20:48:53.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
@@ -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;
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
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

\
 
 \ /
  Last update: 2005-03-22 13:59    [W:0.028 / U:5.960 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site