hal: Branch 'master'

[Joe Marcus Clarke]

 hald/freebsd/hf-net.c |    1 -
 hald/freebsd/hf-usb.c |    2 --
 2 files changed, 3 deletions(-)

New commits:
commit 07aa98f48e8fb6bd0f1ef3ba470ea370f3ed1bf5
Author: Joe Marcus Clarke <marcus at FreeBSD.org>
Date:   Fri Mar 7 18:23:02 2008 -0500

    re-remove deprecated keys
    
    Re-remove the deprecated keys now that the deprecated-keys FDI file has
    been committed.
    
    Requested by:	Danny Kukawka

diff --git a/hald/freebsd/hf-net.c b/hald/freebsd/hf-net.c
index 8648e6f..ec0f328 100644
--- a/hald/freebsd/hf-net.c
+++ b/hald/freebsd/hf-net.c
@@ -161,7 +161,6 @@ hf_net_device_new (const char *interface, HalDevice *parent, GError **err)
   hal_device_property_set_string(device, "net.address", mac ? mac : "00:00:00:00:00:00");
   hal_device_property_set_string(device, "net.interface", interface);
   hal_device_property_set_string(device, "net.originating_device", hal_device_get_udi(parent));
-  hal_device_property_set_string(device, "net.physical_device", hal_device_get_udi(parent));
   hal_device_property_set_string(device, "net.media", media);
   if (hf_devtree_is_driver(interface, "fwe"))
     hal_device_property_set_int(device, "net.arp_proto_hw_id", ARPHRD_IEEE1394);
diff --git a/hald/freebsd/hf-usb.c b/hald/freebsd/hf-usb.c
index 60ddd74..d04f7f2 100644
--- a/hald/freebsd/hf-usb.c
+++ b/hald/freebsd/hf-usb.c
@@ -335,7 +335,6 @@ hf_usb_device_new (HalDevice *parent,
   device = hf_device_new(parent);
 
   hal_device_property_set_string(device, "info.subsystem", "usb_device");
-  hal_device_property_set_string(device, "info.bus", "usb_device");
   hal_device_property_set_string(device, "info.product", di->udi_product);
   hal_device_property_set_string(device, "info.vendor", di->udi_vendor);
 
@@ -470,7 +469,6 @@ hf_usb_interface_device_new (HalDevice *parent,
   device = hf_device_new(parent);
 
   hal_device_property_set_string(device, "info.subsystem", "usb");
-  hal_device_property_set_string(device, "info.bus", "usb");
 
   hal_device_merge_with_rewrite(device, parent, "usb.", "usb_device.");