summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2010-09-29 13:39:04 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2010-09-29 13:39:04 +0000
commita1db36e23df71542df860215f73a8eab8a0f9680 (patch)
tree5f6446df64b988bd02dec11b85f586351f515daa /sys
parent36fc88cdedf06e6dabd897a75a09b6359385ddb7 (diff)
It's never too late to make things at least compile.
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/luna88k/dev/siotty.c4
-rw-r--r--sys/arch/luna88k/luna88k/disksubr.c5
2 files changed, 4 insertions, 5 deletions
diff --git a/sys/arch/luna88k/dev/siotty.c b/sys/arch/luna88k/dev/siotty.c
index b6239035ba1..7469381667b 100644
--- a/sys/arch/luna88k/dev/siotty.c
+++ b/sys/arch/luna88k/dev/siotty.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: siotty.c,v 1.14 2010/07/02 17:27:01 nicm Exp $ */
+/* $OpenBSD: siotty.c,v 1.15 2010/09/29 13:39:03 miod Exp $ */
/* $NetBSD: siotty.c,v 1.9 2002/03/17 19:40:43 atatat Exp $ */
/*-
@@ -387,7 +387,7 @@ sioopen(dev, flag, mode, p)
#endif
}
- error = ttyopen(dev, tp);
+ error = ttyopen(dev, tp, p);
if (error > 0)
return error;
/*
diff --git a/sys/arch/luna88k/luna88k/disksubr.c b/sys/arch/luna88k/luna88k/disksubr.c
index 22f51d2d1f3..bb8aacdd633 100644
--- a/sys/arch/luna88k/luna88k/disksubr.c
+++ b/sys/arch/luna88k/luna88k/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.45 2010/04/25 06:15:17 deraadt Exp $ */
+/* $OpenBSD: disksubr.c,v 1.46 2010/09/29 13:39:03 miod Exp $ */
/* $NetBSD: disksubr.c,v 1.12 2002/02/19 17:09:44 wiz Exp $ */
/*
@@ -88,7 +88,7 @@
#error "Default value of LABELSECTOR no longer zero?"
#endif
-char *disklabel_om_to_bsd(struct sun_disklabel *, struct disklabel *);
+int disklabel_om_to_bsd(struct sun_disklabel *, struct disklabel *);
int disklabel_bsd_to_om(struct disklabel *, struct sun_disklabel *);
/*
@@ -107,7 +107,6 @@ int
readdisklabel(dev_t dev, void (*strat)(struct buf *),
struct disklabel *lp, int spoofonly)
{
- struct sun_disklabel *slp;
struct buf *bp = NULL;
int error;