X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=rules%2Frules.d%2F50-udev-default.rules;h=c4eb9276addcd085efb78638a89b75e5f9270e09;hb=4281da1fa6fda10c15bee984825fc607a8385004;hp=10cfbd61577a8cd4fef6b1bda6a22ab7e9c9eb1c;hpb=2da64971fd6756eba4806e8abb4b42fff4675054;p=elogind.git

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index 10cfbd615..c4eb9276a 100644
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -42,18 +42,15 @@ SUBSYSTEM=="drm",		GROUP="video"
 
 # sound
 SUBSYSTEM=="sound",		GROUP="audio"
-KERNEL=="mixer0",		SYMLINK+="mixer"
 
 # DVB (video)
 SUBSYSTEM=="dvb", GROUP="video"
 
 # FireWire (firewire-core driver: IIDC devices, AV/C devices)
 SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x00010*", GROUP="video"
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00b09d:0x00010*", GROUP="video"
 SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x010001*", GROUP="video"
-
-# FireWire (deprecated dv1394 and video1394 drivers)
-KERNEL=="dv1394-[0-9]*",	NAME="dv1394/%n", GROUP="video"
-KERNEL=="video1394-[0-9]*",	NAME="video1394/%n", GROUP="video"
+SUBSYSTEM=="firewire", ATTR{units}=="*0x00a02d:0x014001*", GROUP="video"
 
 # libusb device nodes
 SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", MODE="0664"
@@ -104,7 +101,7 @@ KERNEL=="rfkill",		MODE="0644"
 # CPU
 KERNEL=="cpu[0-9]*",		MODE="0444"
 
-KERNEL=="fuse",			MODE="0666", OPTIONS+="static_node=fuse" \
+KERNEL=="fuse",			MODE="0666", OPTIONS+="static_node=fuse", \
   RUN+="/bin/mount -t fusectl fusectl /sys/fs/fuse/connections"
 
 SUBSYSTEM=="rtc", DRIVERS=="rtc_cmos", SYMLINK+="rtc"