summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2007-08-04 09:11:12 +0000
committerThierry Vignaud <tv@mandriva.org>2007-08-04 09:11:12 +0000
commit0bcd81847e0c3ac67e20c33c43b59c45ac311cb0 (patch)
tree3085dfbe973388fd4bcafefc2d607207957e3e7d
parent45290b5af5fa81dcedacbc5e49db11abba146256 (diff)
downloadldetect-0bcd81847e0c3ac67e20c33c43b59c45ac311cb0.tar
ldetect-0bcd81847e0c3ac67e20c33c43b59c45ac311cb0.tar.gz
ldetect-0bcd81847e0c3ac67e20c33c43b59c45ac311cb0.tar.bz2
ldetect-0bcd81847e0c3ac67e20c33c43b59c45ac311cb0.tar.xz
ldetect-0bcd81847e0c3ac67e20c33c43b59c45ac311cb0.zip
(pci_probe) kill some quirks that are either obsolete now that we
resolve modalias (which bring wildcard support) or were removed from the kernel (eg: sata_nv do not more probe on class)
-rw-r--r--pci.c31
1 files changed, 1 insertions, 30 deletions
diff --git a/pci.c b/pci.c
index fd7a798..06e1ca8 100644
--- a/pci.c
+++ b/pci.c
@@ -98,40 +98,11 @@ extern struct pciusb_entries pci_probe(void) {
/* special rules below must be in sync with gi/mdk-stage1/probing.c */
- if (e->class_id == PCI_CLASS_SERIAL_USB) {
- /* taken from kudzu's pci.c */
- char *module =
- class_prog == 0 ? "usb-uhci" :
- class_prog == 0x10 ? "usb-ohci" :
- class_prog == 0x20 ? "ehci-hcd" : NULL;
- if (module) e->module = strdup(module);
-
- } else if (e->class_id == PCI_CLASS_SERIAL_FIREWIRE) {
- /* taken from kudzu's pci.c */
- if (class_prog == 0x10) e->module = strdup("ohci1394");
-
- } else if (e->class_id == PCI_CLASS_BRIDGE_CARDBUS) {
- e->module = strdup("yenta_socket");
- } else if (e->class_id == (PCI_CLASS_BRIDGE_HOST << 8)) { /* AGP */
- if (e->vendor == 0x10b9)
- e->module = strdup("ali-agp");
- else if (e->vendor == 0x1002)
- e->module = strdup("ati-agp");
- else if (e->vendor == 0x1039)
- e->module = strdup("sis-agp");
- else if (e->vendor == 0x1166)
- e->module = strdup("sworks-agp");
- else if (e->vendor == 0x1279)
- e->module = strdup("efficeon-agp");
- } else if (e->device == 0x8139) {
+ if (e->device == 0x8139) {
if (e->subvendor == 0x8139 && e->subdevice == 0x10ec
|| e->subvendor == 0x1186 && e->subdevice == 0x1300
|| e->subvendor == 0x13d1 && e->subdevice == 0xab06)
e->module = strdup("8139too");
- } else if (e->vendor == 0x10de && e->class_id == PCI_CLASS_STORAGE_IDE) {
- e->module = strdup("sata_nv");
- } else if (e->vendor == 0x10b5 && (e->device == 0x9030 || e->device == 0x9050) && e->subvendor == 0x1369) {
- e->module = strdup("snd-vx222");
} else if (e->vendor == 0x1119) { /* Vortex only makes RAID controllers. */
e->module = strdup("gdth");
}