--- trunk/udev/udev-sound-card.rules.magellan	2010/12/10 23:27:46	1236
+++ trunk/udev/udev-sound-card.rules.magellan	2010/12/16 17:39:17	1237
@@ -81,13 +81,6 @@
 # Identify cards on the internal PCI bus as internal
 SUBSYSTEMS=="pci", DEVPATH=="*/0000:00:??.?/sound/*", ENV{SOUND_FORM_FACTOR}="internal", GOTO="sound_end"
 
-# Recognize good old WinTV cards and those based on saa7134 as TV cards
-SUBSYSTEMS=="pci", DRIVERS=="Bt87x", ENV{SOUND_FORM_FACTOR}="tv", GOTO="sound_end"
-SUBSYSTEMS=="pci", DRIVERS=="saa7134", ENV{SOUND_FORM_FACTOR}="tv", GOTO="sound_end"
-
-# Hmm, do we really want this database here?
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0471", ATTRS{idProduct}=="0311", ENV{SOUND_FORM_FACTOR}="webcam", GOTO="sound_end"
-
 # Devices that also support Image/Video interfaces are most likely webcams
 SUBSYSTEMS=="usb", ENV{ID_USB_INTERFACES}=="*:0e????:*", ENV{SOUND_FORM_FACTOR}="webcam", GOTO="sound_end"