more merge fixups

[elogind.git] / etc / udev / udev.rules.gentoo

diff --git a/etc/udev/udev.rules.gentoo b/etc/udev/udev.rules.gentoo
index 997acb8a34caeb1bac91581733d7aca86535e5d9..6a53e88d9d39ffe868ca225aca5df8337871b8e3 100644 (file)
--- a/etc/udev/udev.rules.gentoo
+++ b/etc/udev/udev.rules.gentoo
@@ -14,7 +14,7 @@
 
 # cdrom symlinks and other good cdrom naming
 BUS="ide",  KERNEL="hd[a-z]",  PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
-BUS="scsi", KERNEL="sr[a-z]",  PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
+BUS="scsi", KERNEL="sr[0-9]*",  PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
 BUS="scsi", KERNEL="scd[a-z]", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYMLINK="%c{1} %c{2} %c{3} %c{4} %c{5} %c{6}"
 
 # devfs-names for ide-devices (uncomment only one)
@@ -140,3 +140,10 @@ KERNEL="radio[0-9]*",      NAME="v4l/radio%n"
 KERNEL="vbi[0-9]*",    NAME="v4l/vbi%n",       SYMLINK="vbi%n"
 KERNEL="vtx[0-9]*",    NAME="v4l/vtx%n"
 
+# Asterix Zaptel devices
+KERNEL="zapctl",       NAME="zap/ctl"
+KERNEL="zaptimer",     NAME="zap/timer"
+KERNEL="zapchannel",   NAME="zap/channel"
+KERNEL="zappseudo",    NAME="zap/pseudo"
+KERNEL="zap[0-9]*",    NAME="zap/%n"
+