From 2abd35bc59125ff33e3d2acfb141e879a20bd035 Mon Sep 17 00:00:00 2001
From: Peter Grehan <grehan@FreeBSD.org>
Date: Fri, 12 Dec 2003 09:54:39 +0000
Subject: [PATCH] - accept device_type of "block", which is how psim/gdb6.0
 defines disks. continue to accept "disk" for psim/gdb5.x users. - remove
 unneeded ofwd_identify

---
 sys/dev/ofw/ofw_disk.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/sys/dev/ofw/ofw_disk.c b/sys/dev/ofw/ofw_disk.c
index 86ec347fb3de..c37af75fe178 100644
--- a/sys/dev/ofw/ofw_disk.c
+++ b/sys/dev/ofw/ofw_disk.c
@@ -60,7 +60,6 @@ static int	ofwd_probe(device_t);
 static int	ofwd_attach(device_t);
 
 static device_method_t	ofwd_methods[] = {
-	DEVMETHOD(device_identify,	ofwd_identify),
 	DEVMETHOD(device_probe, 	ofwd_probe),
 	DEVMETHOD(device_attach,	ofwd_attach),
 	{ 0, 0 }
@@ -145,7 +144,8 @@ ofwd_probe(device_t dev)
 
 	type = nexus_get_device_type(dev);
 
-	if (type == NULL || strcmp(type, "disk") != 0)
+	if (type == NULL || 
+	    (strcmp(type, "disk") != 0 && strcmp(type, "block") != 0))
 		return (ENXIO);
 
 	device_set_desc(dev, "OpenFirmware disk");
@@ -183,8 +183,3 @@ ofwd_attach(device_t dev)
 
 	return (0);
 }
-
-static void
-ofwd_identify(driver_t *driver, device_t parent)
-{
-}