From: Greg KH <greg@press.(none)>
Date: Thu, 14 Jul 2005 21:13:34 +0000 (-0700)
Subject: Merge gregkh@ehlo.org:/home/kay/public_html/pub/scm/linux/hotplug/udev-kay
X-Git-Tag: 064~15
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=39e54555a961fa6c4c8e7d260a0e208439dc0cfa;hp=7fe082a8a42baa45ef45d82edde4f893410ebeea

Merge gregkh@ehlo.org:/home/kay/public_html/linux/hotplug/udev-kay
---

diff --git a/etc/udev/gentoo/udev.rules b/etc/udev/gentoo/udev.rules
index a0e17359b..572e5c8ce 100644
--- a/etc/udev/gentoo/udev.rules
+++ b/etc/udev/gentoo/udev.rules
@@ -120,6 +120,11 @@ KERNEL=="tun",		NAME="net/%k"
 # ramdisk devices
 KERNEL=="ram[0-9]*",	NAME="rd/%n", SYMLINK+="%k"
 
+# IEEE1394 (firewire) devices (must be before raw devices below)
+KERNEL=="raw1394",	NAME="%k",		GROUP="video"
+KERNEL=="dv1394*",	NAME="dv1394/%n",	GROUP="video"
+KERNEL=="video1394*",	NAME="video1394/%n",	GROUP="video"
+
 # raw devices
 KERNEL=="raw[0-9]*",	NAME="raw/%k", GROUP="disk"
 KERNEL=="ram*",		NAME="%k", GROUP="disk"
@@ -243,11 +248,6 @@ KERNEL=="issm*",	NAME="infiniband/%k"
 # tpm devices
 KERNEL=="tpm*",	NAME="%k", OWNER="tss", GROUP="tss", MODE="0600"
 
-# IEEE1394 (firewire) devices
-KERNEL=="raw1394", NAME="%k", GROUP="video"
-KERNEL=="dv1394*", NAME="dv1394/%n", GROUP="video"
-KERNEL=="video1394*", NAME="video1394/%n", GROUP="video"
-
 # be backward compatible for a while with the /etc/dev.d and /etc/hotplug.d/ systems
 # run /etc/hotplug.d/ stuff only if we came from a hotplug event, not for udevstart
 ENV{UDEVD_EVENT}=="1", RUN+="/sbin/udev_run_hotplugd"