summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-05-06 19:04:16 +0000
committerThierry Vignaud <tv@mageia.org>2011-05-06 19:04:16 +0000
commit2c78a987b6491d6a39d33543d0a915907a75db47 (patch)
tree3fcbc81acc1a56dbdb7324d859f4f38f4d688905
parented8d918d7233eec853fc1ebd2a1d4cbd9293a82f (diff)
downloaddrakx-2c78a987b6491d6a39d33543d0a915907a75db47.tar
drakx-2c78a987b6491d6a39d33543d0a915907a75db47.tar.gz
drakx-2c78a987b6491d6a39d33543d0a915907a75db47.tar.bz2
drakx-2c78a987b6491d6a39d33543d0a915907a75db47.tar.xz
drakx-2c78a987b6491d6a39d33543d0a915907a75db47.zip
update yenta_socket ID list from kernel, thus handling more PCMCIA controllers
-rw-r--r--mdk-stage1/NEWS1
-rw-r--r--mdk-stage1/pcmcia/probe.c9
2 files changed, 10 insertions, 0 deletions
diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index 6d404e998..ebad371a8 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,4 +1,5 @@
- use new libldetect API for finding out unknown devices
+- handle more PCMCIA controllers
1.48:
- arm/mips support
diff --git a/mdk-stage1/pcmcia/probe.c b/mdk-stage1/pcmcia/probe.c
index 2d30a7a0d..04b8aa0d9 100644
--- a/mdk-stage1/pcmcia/probe.c
+++ b/mdk-stage1/pcmcia/probe.c
@@ -72,6 +72,10 @@ typedef struct {
pci_id_t pci_id[] = {
{ 0x1013, 0x1100, "i82365", "Cirrus Logic CL 6729" },
{ 0x1013, 0x1110, "yenta_socket", "Cirrus Logic PD 6832" },
+ { 0x104c, 0x8011, "yenta_socket", "" },
+ { 0x104c, 0x8031, "yenta_socket", "Texas Instruments|PCIxx21/x515 Cardbus Controller" },
+ { 0x104c, 0x8036, "yenta_socket", "Texas Instruments|PCI6515 Cardbus Controller" },
+ { 0x104c, 0x8039, "yenta_socket", "Texas Instruments|PCIxx12 Cardbus Controller " },
{ 0x104c, 0xac12, "yenta_socket", "Texas Instruments PCI1130" },
{ 0x104c, 0xac13, "yenta_socket", "Texas Instruments PCI1031" },
{ 0x104c, 0xac15, "yenta_socket", "Texas Instruments PCI1131" },
@@ -98,6 +102,8 @@ pci_id_t pci_id[] = {
{ 0x104c, 0xac54, "yenta_socket", "Texas Instruments PCI1620" },
{ 0x104c, 0xac55, "yenta_socket", "Texas Instruments PCI1520" },
{ 0x104c, 0xac56, "yenta_socket", "Texas Instruments PCI1510" },
+ { 0x104c, 0xac8d, "yenta_socket", "Texas Instruments|PCI7620" },
+ { 0x104c, 0xac8e, "yenta_socket", "Texas Instruments|PCI7420 CardBus Controller" },
{ 0x104c, 0xac8e, "yenta_socket", "Texas Instruments PCI7420" },
{ 0x10b3, 0xb106, "yenta_socket", "SMC 34C90" },
{ 0x1179, 0x0603, "i82365", "Toshiba ToPIC95-A" },
@@ -124,7 +130,10 @@ pci_id_t pci_id[] = {
{ 0x1524, 0x1225, "yenta_socket", "ENE 1225" },
{ 0x1524, 0x1410, "yenta_socket", "ENE 1410" },
{ 0x1524, 0x1411, "yenta_socket", "ENE Technology CB1411" },
+ { 0x1524, 0x1412, "yenta_socket", "ENE Technology Inc|CB-712/4 Cardbus Controller " },
{ 0x1524, 0x1420, "yenta_socket", "ENE 1420" },
+ { 0x1524, 0x1421, "yenta_socket", "ENE Technology Inc|CB-720/2/4 Cardbus Controller" },
+ { 0x1524, 0x1422, "yenta_socket", "ENE Technology Inc|CB-722/4 Cardbus Controller" },
{ 0x8086, 0x1221, "i82092", "Intel 82092AA_0" },
{ 0x8086, 0x1222, "i82092", "Intel 82092AA_1" },
};