summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgreg@kroah.com <greg@kroah.com>2004-03-29 18:33:48 -0800
committerGreg KH <gregkh@suse.de>2005-04-26 21:35:12 -0700
commit69b94397d32d8f2ba41a8e2987318b2eb144f673 (patch)
treee4e35e8bca9877fe245b0d37fea6fcc23b348233
parent6d472fe777b237d5843dda9e685f225e2c7341b4 (diff)
[PATCH] fix up udev.rules to handle oss rules better.
Patch from Jordan <lx_xero@comcast.net>
-rw-r--r--etc/udev/udev.rules2
-rw-r--r--etc/udev/udev.rules.gentoo18
2 files changed, 12 insertions, 8 deletions
diff --git a/etc/udev/udev.rules b/etc/udev/udev.rules
index 370a961de1..725294cede 100644
--- a/etc/udev/udev.rules
+++ b/etc/udev/udev.rules
@@ -18,7 +18,7 @@ KERNEL="card*", NAME="dri/card%n"
KERNEL="controlC[0-9]*", NAME="snd/%k"
KERNEL="hw[CD0-9]*", NAME="snd/%k"
KERNEL="pcm[CD0-9cp]*", NAME="snd/%k"
-KERNEL="midi[CD0-9]*", NAME="snd/%k"
+KERNEL="midiC[D0-9]*", NAME="snd/%k"
KERNEL="timer", NAME="snd/%k"
KERNEL="seq", NAME="snd/%k"
diff --git a/etc/udev/udev.rules.gentoo b/etc/udev/udev.rules.gentoo
index f8419a2925..eb72931c3f 100644
--- a/etc/udev/udev.rules.gentoo
+++ b/etc/udev/udev.rules.gentoo
@@ -54,7 +54,7 @@ BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", NAME
KERNEL="controlC[0-9]*", NAME="snd/%k"
KERNEL="hw[CD0-9]*", NAME="snd/%k"
KERNEL="pcm[CD0-9cp]*", NAME="snd/%k"
-KERNEL="midi[CD0-9]*", NAME="snd/%k"
+KERNEL="midiC[D0-9]*", NAME="snd/%k"
KERNEL="timer", NAME="snd/%k"
KERNEL="seq", NAME="snd/%k"
@@ -103,12 +103,16 @@ KERNEL="tty[p-za-e][0-9a-f]*", NAME="tty/s%n", SYMLINK="%k"
KERNEL="ram[0-9]*", NAME="rd/%n", SYMLINK="%k"
# sound devices
-KERNEL="adsp", NAME="sound/adsp", SYMLINK="%k"
-KERNEL="audio", NAME="sound/audio", SYMLINK="%k"
-KERNEL="dsp", NAME="sound/dsp", SYMLINK="%k"
-KERNEL="mixer", NAME="sound/mixer", SYMLINK="%k"
-KERNEL="sequencer", NAME="sound/sequencer", SYMLINK="%k"
-KERNEL="sequencer2", NAME="sound/sequencer2", SYMLINK="%k"
+KERNEL="adsp", NAME="sound/%k", SYMLINK="%k"
+KERNEL="adsp[0-9]*", NAME="sound/%k", SYMLINK="%k"
+KERNEL="audio", NAME="sound/%k", SYMLINK="%k"
+KERNEL="audio[0-9]*", NAME="sound/%k", SYMLINK="%k"
+KERNEL="dsp", NAME="sound/%k", SYMLINK="%k"
+KERNEL="dsp[0-9]*", NAME="sound/%k", SYMLINK="%k"
+KERNEL="mixer", NAME="sound/%k", SYMLINK="%k"
+KERNEL="mixer[0-9]*", NAME="sound/%k", SYMLINK="%k"
+KERNEL="sequencer", NAME="sound/%k", SYMLINK="%k"
+KERNEL="sequencer[0-9]*", NAME="sound/%k", SYMLINK="%k"
# tty devices
KERNEL="tty[0-9]*", NAME="vc/%n", SYMLINK="%k"