X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=rules%2F78-sound-card.rules;h=295f4901505991f34bc550ad5a7eb842b42ffbbd;hp=e564441893c8d6de7a6b61c788127c6c1d33ee02;hb=6294b8a92db8579210d4fc9ce74097a15005b3e6;hpb=3e2147858f21943d5f4a781c60f33ac22c6096ed;ds=sidebyside

diff --git a/rules/78-sound-card.rules b/rules/78-sound-card.rules
index e56444189..295f49015 100644
--- a/rules/78-sound-card.rules
+++ b/rules/78-sound-card.rules
@@ -37,8 +37,8 @@ KERNEL!="card*", GOTO="sound_end"
 
 ENV{SOUND_INITIALIZED}="1"
 
+IMPORT{builtin}="hwdb"
 SUBSYSTEMS=="usb", IMPORT{builtin}="usb_id"
-SUBSYSTEMS=="usb", IMPORT{builtin}="usb-db"
 SUBSYSTEMS=="usb", GOTO="skip_pci"
 
 SUBSYSTEMS=="firewire", ATTRS{vendor_name}=="?*", ATTRS{model_name}=="?*", \
@@ -46,10 +46,7 @@ SUBSYSTEMS=="firewire", ATTRS{vendor_name}=="?*", ATTRS{model_name}=="?*", \
 SUBSYSTEMS=="firewire", ATTRS{guid}=="?*", ENV{ID_ID}="firewire-$attr{guid}"
 SUBSYSTEMS=="firewire", GOTO="skip_pci"
 
-
-SUBSYSTEMS=="pci", IMPORT{builtin}="pci-db"
 SUBSYSTEMS=="pci", ENV{ID_BUS}="pci", ENV{ID_VENDOR_ID}="$attr{vendor}", ENV{ID_MODEL_ID}="$attr{device}"
-
 LABEL="skip_pci"
 
 ENV{ID_SERIAL}=="?*", ENV{ID_USB_INTERFACE_NUM}=="?*", ENV{ID_ID}="$env{ID_BUS}-$env{ID_SERIAL}-$env{ID_USB_INTERFACE_NUM}-$attr{id}"