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 83407ea9d002e7baaae1920c49f20d0566bb8858..6a53e88d9d39ffe868ca225aca5df8337871b8e3 100644 (file)
--- a/etc/udev/udev.rules.gentoo
+++ b/etc/udev/udev.rules.gentoo
@@ -19,7 +19,7 @@ BUS="scsi", KERNEL="scd[a-z]", PROGRAM="/etc/udev/scripts/cdsymlinks.sh %k", SYM
 
 # devfs-names for ide-devices (uncomment only one)
 #  /dev/ide/.../{disc,cd} and /dev/{cdroms,discs}/* type names
-BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}"
+BUS="ide", KERNEL="hd*", PROGRAM="/etc/udev/scripts/ide-devfs.sh %k %b %n", NAME="%k", SYMLINK="%c{1} %c{2}", GROUP="%c{3}"
 
 # dri devices
 KERNEL="card*",                NAME="dri/card%n"
@@ -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"
+