From: Matthias Schwarzott <zzam@gentoo.org>
Date: Tue, 25 Sep 2007 15:52:42 +0000 (+0200)
Subject: rules: Gentoo update
X-Git-Tag: 174~1808
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=38e62fef89097ec3604320104197c48ebda0d591

rules: Gentoo update
---

diff --git a/etc/udev/gentoo/40-audio.rules b/etc/udev/gentoo/40-audio.rules
deleted file mode 100644
index 8dfcb2862..000000000
--- a/etc/udev/gentoo/40-audio.rules
+++ /dev/null
@@ -1,23 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-# alsa devices
-SUBSYSTEM=="sound", GROUP="audio"
-KERNEL=="controlC[0-9]*",	NAME="snd/%k"
-KERNEL=="hwC[D0-9]*",		NAME="snd/%k"
-KERNEL=="pcmC[D0-9cp]*",	NAME="snd/%k"
-KERNEL=="midiC[D0-9]*",		NAME="snd/%k"
-KERNEL=="timer",		NAME="snd/%k"
-KERNEL=="seq",			NAME="snd/%k"
-
-# Do we need these? upstream has this in 40-alsa.rules, but we never had these
-#KERNEL=="mixer0",		SYMLINK+="mixer"
-#KERNEL=="dsp0",			SYMLINK+="dsp"
-#KERNEL=="audio0",		SYMLINK+="audio"
-
-# sound devices
-KERNEL=="adsp|adsp[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="audio|audio[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="dsp|dsp[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="mixer|mixer[0-9]*",		NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-KERNEL=="sequencer|sequencer[0-9]*",	NAME="sound/%k", SYMLINK+="%k", GROUP="audio"
-
diff --git a/etc/udev/gentoo/65-permissions.rules b/etc/udev/gentoo/65-permissions.rules
index 1cc31af9e..523c79d7f 100644
--- a/etc/udev/gentoo/65-permissions.rules
+++ b/etc/udev/gentoo/65-permissions.rules
@@ -18,3 +18,5 @@ SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="[18]", GROUP="tape", MODE=
 KERNEL=="ippp*|isdn*|dcbri*", GROUP="uucp"
 KERNEL=="pilot",	GROUP="uucp"
 
+# sound devices (sound=alsa, snd=oss)
+SUBSYSTEM=="sound|snd",	GROUP="audio"