summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys/kern/subr_disk.c3
-rw-r--r--sys/sys/disk.h4
2 files changed, 4 insertions, 3 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 2228f1be758..97c1c10c3c0 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: subr_disk.c,v 1.132 2011/09/18 13:23:38 miod Exp $ */
+/* $OpenBSD: subr_disk.c,v 1.133 2011/09/21 21:43:57 deraadt Exp $ */
/* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */
/*
@@ -83,7 +83,6 @@ u_char rootduid[8]; /* DUID of root disk. */
/* softraid callback, do not use! */
void (*softraid_disk_attach)(struct disk *, int);
-char *disk_readlabel(struct disklabel *, dev_t, char *, size_t);
void disk_attach_callback(void *, void *);
/*
diff --git a/sys/sys/disk.h b/sys/sys/disk.h
index 5766fffd1b9..95a77629419 100644
--- a/sys/sys/disk.h
+++ b/sys/sys/disk.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: disk.h,v 1.31 2011/06/30 16:28:05 matthew Exp $ */
+/* $OpenBSD: disk.h,v 1.32 2011/09/21 21:43:57 deraadt Exp $ */
/* $NetBSD: disk.h,v 1.11 1996/04/28 20:22:50 thorpej Exp $ */
/*
@@ -165,5 +165,7 @@ void disk_lock_nointr(struct disk *);
void disk_unlock(struct disk *);
struct device *disk_lookup(struct cfdriver *, int);
+char *disk_readlabel(struct disklabel *, dev_t, char *, size_t);
+
int disk_map(char *, char *, int, int);
#endif