aboutsummaryrefslogtreecommitdiffstats
path: root/rules
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2009-05-14 00:32:25 +0200
committerKay Sievers <kay.sievers@vrfy.org>2009-05-14 00:32:25 +0200
commit1e5e05730a2554b0bd9fe7ca25b4f7d31907ae97 (patch)
tree3eed5ea5f896fe8bc73ab27c6ac9e0b47c7b8f20 /rules
parent0c37798916bc87d72f5f1399d9e050307901db84 (diff)
downloadudev-1e5e05730a2554b0bd9fe7ca25b4f7d31907ae97.tar.gz
Revert "rules: v4l do not mix vbi and video nodes"
This reverts commit 6205f1186e4980544ea425d31770358d1b2579e4.
Diffstat (limited to 'rules')
-rw-r--r--rules/rules.d/60-persistent-v4l.rules3
1 files changed, 1 insertions, 2 deletions
diff --git a/rules/rules.d/60-persistent-v4l.rules b/rules/rules.d/60-persistent-v4l.rules
index 81f9bbd9..8415cd05 100644
--- a/rules/rules.d/60-persistent-v4l.rules
+++ b/rules/rules.d/60-persistent-v4l.rules
@@ -11,8 +11,7 @@ TEST!="index", GOTO="persistent_v4l_end"
ATTR{index}!="?*", GOTO="persistent_v4l_end"
IMPORT{program}="path_id %p"
-ENV{ID_PATH}=="?*", KERNEL=="video*", SYMLINK+="v4l/by-path/$env{ID_PATH}-video-index$attr{index}"
-ENV{ID_PATH}=="?*", KERNEL=="vbi*", SYMLINK+="v4l/by-path/$env{ID_PATH}-vbi-index$attr{index}"
+ENV{ID_PATH}=="?*", KERNEL=="video*|vbi*", SYMLINK+="v4l/by-path/$env{ID_PATH}-video-index$attr{index}"
ENV{ID_PATH}=="?*", KERNEL=="audio*", SYMLINK+="v4l/by-path/$env{ID_PATH}-audio-index$attr{index}"
LABEL="persistent_v4l_end"