hal: Branch 'master'

[Richard Hughes]

 hald/linux/device.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9ef488ecd56ad36e89529fd6c4c50fb856acff49
Author: Richard Hughes <richard at hughsie.com>
Date:   Mon Oct 27 17:35:30 2008 +0000

    revert a tiny bit of the device ording change as it breaks printer detection
    
    Plugging in a printer no longer automatically configures a queue
    because hal
    is failing to fill in 'printer.*' attributes.
    
    Patch from Tim Waugh <twaugh at redhat.com> fixes things

diff --git a/hald/linux/device.c b/hald/linux/device.c
index 7f529f3..b7912ca 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -4466,8 +4466,8 @@ static DevHandler *dev_handlers[] = {
 	&dev_handler_sound,
 	&dev_handler_tape,
 	&dev_handler_tape390,
-	&dev_handler_usb,
 	&dev_handler_usbclass,
+	&dev_handler_usb,
 	&dev_handler_usbraw,
 	&dev_handler_video4linux,
 	&dev_handler_vio,