rules: merge group "video" into default rules

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index 9b7f7207d1274d9c9775a399f86cd5e62844bf6b..64c73b92ece993dc8477b53ddfbb8a296f911a75 100644 (file)
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -31,21 +31,30 @@ KERNEL=="ts[0-9]*|uinput",  NAME="input/%k", MODE="0600"
 KERNEL=="js[0-9]*",            NAME="input/%k", MODE="0644", SYMLINK+="%k"
 
 # video4linux
+SUBSYSTEM=="video4linux",      GROUP="video"
+KERNEL=="vttuner*",            GROUP="video"
+KERNEL=="vtx*|vbi*",           GROUP="video"
+KERNEL=="winradio*",           GROUP="video"
 KERNEL=="vbi0",                        SYMLINK+="vbi"
 KERNEL=="radio0",              SYMLINK+="radio"
 KERNEL=="video0",              SYMLINK+="video"
 
 # graphics
-KERNEL=="agpgart",             MODE="0600"
+KERNEL=="agpgart",             MODE="0600", GROUP="video"
 KERNEL=="card[0-9]*",          NAME="dri/%k", MODE="0666"
 KERNEL=="fb0",                 SYMLINK+="fb"
+KERNEL=="pmu",                 GROUP="video"
+KERNEL=="nvidia*|nvidiactl*",  GROUP="video"
+SUBSYSTEM=="graphics",         GROUP="video"
 
 # DVB video
 SUBSYSTEM=="dvb", PROGRAM="/bin/sh -c 'K=%k; K=$${K#dvb}; printf dvb/adapter%%i/%%s $${K%%%%.*} $${K#*.}'", NAME="%c"
+SUBSYSTEM=="dvb",              GROUP="video"
 
 # Firewire
 KERNEL=="dv1394*",             SYMLINK+="dv1394/%n"
 KERNEL=="video1394*",          NAME="video1394/%n"
+KERNEL=="dv1394*|video1394*|raw1394*", GROUP="video"
 
 # firmware class requests
 SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"

diff --git a/rules/suse/40-suse.rules b/rules/suse/40-suse.rules
deleted file mode 100644 (file)
index d07a72e..0000000
--- a/rules/suse/40-suse.rules
+++ /dev/null
@@ -1,14 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-KERNEL=="pmu",                 GROUP="video"
-KERNEL=="nvidia*|nvidiactl*",  GROUP="video"
-KERNEL=="nvidia*|nvidiactl*",  GROUP="video"
-KERNEL=="dv1394*|video1394*|raw1394*", GROUP="video"
-KERNEL=="vttuner*",            GROUP="video"
-KERNEL=="vtx*|vbi*",           GROUP="video"
-KERNEL=="winradio*",           GROUP="video"
-SUBSYSTEM=="dvb",              GROUP="video"
-SUBSYSTEM=="graphics",         GROUP="video"
-SUBSYSTEM=="video4linux",      GROUP="video"
-KERNEL=="agpgart",             GROUP="video"
-