Merge from mainline.

	2002-03-27  David O'Brien  <obrien@FreeBSD.org>
	* ppc/hw_disk.c: Export a disk device property.

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 25d96ea78c199eca8948f4fbec7018404fd05222..e1213036013f61cfe4ee3096df09953599403713 100644 (file)
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,3 +1,7 @@
+2002-03-27  David O'Brien  <obrien@FreeBSD.org>
+
+       * ppc/hw_disk.c: Export a disk device property.
+
 2002-02-24  Andrew Cagney  <ac131313@redhat.com>
 
        From wiz at danbala:

diff --git a/sim/ppc/hw_disk.c b/sim/ppc/hw_disk.c
index 5934fead1a1c2288157c665d26b52dbb195c5fde..84086ff1d4ae16e1717b0fa1d7ee9f5700328607 100644 (file)
--- a/sim/ppc/hw_disk.c
+++ b/sim/ppc/hw_disk.c
@@ -232,6 +232,9 @@ hw_disk_init_address(device *me)
                        space, address, 0/*size*/, access_read_write_exec,
                        me);
 
+  /* Tell the world we are a disk.  */
+  device_add_string_property(me, "device_type", "disk");
+
   /* get the name of the file specifying the disk image */
   disk->name_index = 0;
   disk->nr_names = device_find_string_array_property(me, "file",