summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkato <kato@FreeBSD.org>1998-02-09 15:05:44 +0000
committerkato <kato@FreeBSD.org>1998-02-09 15:05:44 +0000
commitf8d05377ff8be6ace91b304f006db821ee456c8c (patch)
tree1542a26837a34771d883b5a3d13eecb27ad97383
parentc6e3a2c91631ef4171ffbba63ff962a87788eac1 (diff)
downloadFreeBSD-src-f8d05377ff8be6ace91b304f006db821ee456c8c.zip
FreeBSD-src-f8d05377ff8be6ace91b304f006db821ee456c8c.tar.gz
Sync with sys/i386/isa/clock.c and spker.c revision 1.109 and 1.32,
resplectivley.
-rw-r--r--sys/pc98/cbus/clock.c4
-rw-r--r--sys/pc98/cbus/pcrtc.c4
-rw-r--r--sys/pc98/pc98/clock.c4
-rw-r--r--sys/pc98/pc98/spkr.c4
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index 463b109..05cba07 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.39 1997/12/29 16:15:57 kato Exp $
+ * $Id: clock.c,v 1.40 1998/01/28 12:25:06 kato Exp $
*/
/*
@@ -154,7 +154,7 @@ u_int tsc_bias;
u_int tsc_comultiplier;
u_int tsc_freq;
u_int tsc_multiplier;
-u_int tsc_present;
+static u_int tsc_present;
int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */
static int beeping = 0;
diff --git a/sys/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c
index 463b109..05cba07 100644
--- a/sys/pc98/cbus/pcrtc.c
+++ b/sys/pc98/cbus/pcrtc.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.39 1997/12/29 16:15:57 kato Exp $
+ * $Id: clock.c,v 1.40 1998/01/28 12:25:06 kato Exp $
*/
/*
@@ -154,7 +154,7 @@ u_int tsc_bias;
u_int tsc_comultiplier;
u_int tsc_freq;
u_int tsc_multiplier;
-u_int tsc_present;
+static u_int tsc_present;
int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */
static int beeping = 0;
diff --git a/sys/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c
index 463b109..05cba07 100644
--- a/sys/pc98/pc98/clock.c
+++ b/sys/pc98/pc98/clock.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)clock.c 7.2 (Berkeley) 5/12/91
- * $Id: clock.c,v 1.39 1997/12/29 16:15:57 kato Exp $
+ * $Id: clock.c,v 1.40 1998/01/28 12:25:06 kato Exp $
*/
/*
@@ -154,7 +154,7 @@ u_int tsc_bias;
u_int tsc_comultiplier;
u_int tsc_freq;
u_int tsc_multiplier;
-u_int tsc_present;
+static u_int tsc_present;
int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */
static int beeping = 0;
diff --git a/sys/pc98/pc98/spkr.c b/sys/pc98/pc98/spkr.c
index 4a17ebd..12313b7 100644
--- a/sys/pc98/pc98/spkr.c
+++ b/sys/pc98/pc98/spkr.c
@@ -4,7 +4,7 @@
* v1.4 by Eric S. Raymond (esr@snark.thyrsus.com) Aug 1993
* modified for FreeBSD by Andrew A. Chernov <ache@astral.msk.su>
*
- * $Id: spkr.c,v 1.9 1997/12/02 21:06:53 phk Exp $
+ * $Id: spkr.c,v 1.10 1998/01/24 02:54:39 eivind Exp $
*/
/*
@@ -34,7 +34,7 @@
#ifdef DEVFS
#include <sys/devfsext.h>
-void *devfs_token;
+static void *devfs_token;
#endif
static d_open_t spkropen;
OpenPOWER on IntegriCloud