hal: Branch 'master'

[Danny Kukawka]

 hald/linux/device.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 02ba46f2d0c5a6b1496764264d1f70038b99d7e5
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Oct 28 10:37:36 2008 +0100

    added comment to not change order of usb and usbclass handler
    
    Added comment to not change order of usb and usbclass device
    handler to prevent problems since both handle the usb subsystem.
    
    TODO: Check if it's possible to rework usb and usbclass functions
          to merge them together.

diff --git a/hald/linux/device.c b/hald/linux/device.c
index b7912ca..37afb10 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -4466,8 +4466,10 @@ static DevHandler *dev_handlers[] = {
 	&dev_handler_sound,
 	&dev_handler_tape,
 	&dev_handler_tape390,
+	/* Don't change order of usbclass and usb */
 	&dev_handler_usbclass,
 	&dev_handler_usb,
+	/* -------------------------------------- */
 	&dev_handler_usbraw,
 	&dev_handler_video4linux,
 	&dev_handler_vio,