diff options
| author | Thierry Vignaud <tv@mageia.org> | 2011-05-06 19:05:54 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2011-05-06 19:05:54 +0000 |
| commit | 62153e7d793fd16d455dbfda7e1ef081812cdaa0 (patch) | |
| tree | 85ae5ebbf1a67b582fb93ec4970377cfa21e3713 | |
| parent | 4c05e5af0bb2ea648152a15a8d3e264a4cdcd42a (diff) | |
| download | drakx-62153e7d793fd16d455dbfda7e1ef081812cdaa0.tar drakx-62153e7d793fd16d455dbfda7e1ef081812cdaa0.tar.gz drakx-62153e7d793fd16d455dbfda7e1ef081812cdaa0.tar.bz2 drakx-62153e7d793fd16d455dbfda7e1ef081812cdaa0.tar.xz drakx-62153e7d793fd16d455dbfda7e1ef081812cdaa0.zip | |
(pci_probe) all "O2 Micro" devices are know managed by yenta_socket
| -rw-r--r-- | mdk-stage1/pcmcia/probe.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/mdk-stage1/pcmcia/probe.c b/mdk-stage1/pcmcia/probe.c index 6e9997dfe..a3b20ab41 100644 --- a/mdk-stage1/pcmcia/probe.c +++ b/mdk-stage1/pcmcia/probe.c @@ -117,15 +117,6 @@ pci_id_t pci_id[] = { { 0x1180, 0x0477, "yenta_socket", "Ricoh RL5C477" }, { 0x1180, 0x0478, "yenta_socket", "Ricoh RL5C478" }, { 0x119b, 0x1221, "pd6729", "Omega Micro 82C092G" }, - { 0x1217, 0x6729, "pd6729", "O2 Micro 6729" }, - { 0x1217, 0x673a, "pd6729", "O2 Micro 6730" }, - { 0x1217, 0x6832, "yenta_socket", "O2 Micro 6832/6833" }, - { 0x1217, 0x6836, "yenta_socket", "O2 Micro 6836/6860" }, - { 0x1217, 0x6872, "yenta_socket", "O2 Micro 6812" }, - { 0x1217, 0x6925, "yenta_socket", "O2 Micro 6922" }, - { 0x1217, 0x6933, "yenta_socket", "O2 Micro 6933" }, - { 0x1217, 0x6972, "yenta_socket", "O2 Micro 6912" }, - { 0x1217, 0x7114, "yenta_socket", "O2 Micro 711M1" }, { 0x1524, 0x1211, "yenta_socket", "ENE 1211" }, { 0x1524, 0x1225, "yenta_socket", "ENE 1225" }, { 0x1524, 0x1410, "yenta_socket", "ENE 1410" }, @@ -154,6 +145,11 @@ static int pci_probe(void) while (fgets(s, 256, f) != NULL) { u_int n = strtoul(s+5, NULL, 16); vendor = (n >> 16); device = (n & 0xffff); + if (vendor == 0x1217) { + driver = "yenta_socket"; + name = "PCMCIA Controller"; + break; + } for (i = 0; i < PCI_COUNT; i++) if ((vendor == pci_id[i].vendor) && (device == pci_id[i].device)) break; |