summaryrefslogtreecommitdiffstats
path: root/lib/libdisk
diff options
context:
space:
mode:
authormsmith <msmith@FreeBSD.org>1999-07-05 09:43:29 +0000
committermsmith <msmith@FreeBSD.org>1999-07-05 09:43:29 +0000
commit0891003b8364c34e82c45bd6fe5a5593b7beae74 (patch)
tree053321b4d33e7c855592b5d2d9e2173058440bae /lib/libdisk
parentda22bdf3621704fffe9fb90b038082f6487d37f1 (diff)
downloadFreeBSD-src-0891003b8364c34e82c45bd6fe5a5593b7beae74.zip
FreeBSD-src-0891003b8364c34e82c45bd6fe5a5593b7beae74.tar.gz
Merge from -stable; support for the 'ida' driver, move fla to major 102
Diffstat (limited to 'lib/libdisk')
-rw-r--r--lib/libdisk/create_chunk.c6
-rw-r--r--lib/libdisk/disk.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c
index 6824c88..ab660d9 100644
--- a/lib/libdisk/create_chunk.c
+++ b/lib/libdisk/create_chunk.c
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $Id: create_chunk.c,v 1.35 1999/05/04 22:44:47 msmith Exp $
+ * $Id: create_chunk.c,v 1.36 1999/05/12 23:50:50 msmith Exp $
*
*/
@@ -267,7 +267,9 @@ MakeDev(struct chunk *c1, const char *path)
else if (!strncmp(p, "wfd", 3))
bmaj = 1, cmaj = 87, p += 3;
else if (!strncmp(p, "fla", 3))
- bmaj = 28, cmaj = 101, p += 3;
+ bmaj = 28, cmaj = 102, p += 3;
+ else if (!strncmp(p, "ida", 3))
+ bmaj = 29, cmaj = 109, p += 3;
else if (!strncmp(p, "da", 2)) /* CAM support */
bmaj = 4, cmaj = 13, p += 2;
else {
diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c
index 67c3867..73193d4 100644
--- a/lib/libdisk/disk.c
+++ b/lib/libdisk/disk.c
@@ -6,7 +6,7 @@
* this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp
* ----------------------------------------------------------------------------
*
- * $Id: disk.c,v 1.43 1999/05/08 21:21:50 dfr Exp $
+ * $Id: disk.c,v 1.44 1999/05/09 11:34:56 dfr Exp $
*
*/
@@ -375,7 +375,7 @@ Collapse_Disk(struct disk *d)
}
#endif
-static char * device_list[] = {"wd", "ad", "sd", "da", "wfd", "fla", 0};
+static char * device_list[] = {"wd", "ad", "sd", "da", "wfd", "fla", "ida", 0};
char **
Disk_Names()
OpenPOWER on IntegriCloud