summaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-01-10 05:27:25 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-01-10 05:27:25 +0000
commitc9c06167e7933d93a6e396174c68abf242294abb (patch)
treed9a8bb30663e9a3405a1ef37ffb62bc14b9f019f /drivers/macintosh
parentf79e8cc3c34e4192a3e5ef4cc9c6542fdef703c0 (diff)
Merge with Linux 2.4.0-test12.
Diffstat (limited to 'drivers/macintosh')
-rw-r--r--drivers/macintosh/mac_keyb.c2
-rw-r--r--drivers/macintosh/via-macii.c1
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/macintosh/mac_keyb.c b/drivers/macintosh/mac_keyb.c
index 662f4a7f5..80616affa 100644
--- a/drivers/macintosh/mac_keyb.c
+++ b/drivers/macintosh/mac_keyb.c
@@ -255,8 +255,6 @@ int adb_button2_keycode = 0x7d; /* right control key */
int adb_button3_keycode = 0x7c; /* right option key */
#endif
-extern int console_loglevel;
-
extern struct kbd_struct kbd_table[];
extern wait_queue_head_t keypress_wait;
diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c
index f4670f1db..c6e84f66f 100644
--- a/drivers/macintosh/via-macii.c
+++ b/drivers/macintosh/via-macii.c
@@ -125,7 +125,6 @@ static int last_status;
static int driver_running = 0;
/* debug level 10 required for ADB logging (should be && debug_adb, ideally) */
-extern int console_loglevel;
/* Check for MacII style ADB */
static int macii_probe(void)