From 4c05e5af0bb2ea648152a15a8d3e264a4cdcd42a Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Fri, 6 May 2011 19:05:06 +0000
Subject: "i82365" driver was renamed "pd6729"

---
 mdk-stage1/NEWS           |  1 +
 mdk-stage1/pcmcia/probe.c | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'mdk-stage1')

diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS
index ebad371a8..77151e3c3 100644
--- a/mdk-stage1/NEWS
+++ b/mdk-stage1/NEWS
@@ -1,5 +1,6 @@
 - use new libldetect API for finding out unknown devices
 - handle more PCMCIA controllers
+- "i82365" driver was renamed "pd6729"
 
 1.48:
 - arm/mips support
diff --git a/mdk-stage1/pcmcia/probe.c b/mdk-stage1/pcmcia/probe.c
index 04b8aa0d9..6e9997dfe 100644
--- a/mdk-stage1/pcmcia/probe.c
+++ b/mdk-stage1/pcmcia/probe.c
@@ -70,7 +70,7 @@ typedef struct {
 } pci_id_t;
 
 pci_id_t pci_id[] = {
-    { 0x1013, 0x1100, "i82365", "Cirrus Logic CL 6729" },
+    { 0x1013, 0x1100, "pd6729", "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" },
@@ -106,7 +106,7 @@ pci_id_t pci_id[] = {
     { 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" }, 
+    { 0x1179, 0x0603, "pd6729", "Toshiba ToPIC95-A" }, 
     { 0x1179, 0x060a, "yenta_socket", "Toshiba ToPIC95-B" }, 
     { 0x1179, 0x060f, "yenta_socket", "Toshiba ToPIC97" }, 
     { 0x1179, 0x0617, "yenta_socket", "Toshiba ToPIC100" }, 
@@ -116,9 +116,9 @@ pci_id_t pci_id[] = {
     { 0x1180, 0x0476, "yenta_socket", "Ricoh RL5C476" },
     { 0x1180, 0x0477, "yenta_socket", "Ricoh RL5C477" },
     { 0x1180, 0x0478, "yenta_socket", "Ricoh RL5C478" },
-    { 0x119b, 0x1221, "i82365", "Omega Micro 82C092G" }, 
-    { 0x1217, 0x6729, "i82365", "O2 Micro 6729" }, 
-    { 0x1217, 0x673a, "i82365", "O2 Micro 6730" }, 
+    { 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" }, 
@@ -525,7 +525,7 @@ char * pcmcia_probe(void)
 	if (!pci_probe())
 		return driver;
 	else if (!i365_probe())
-		return "i82365";
+		return "pd6729";
 	else if (!tcic_probe())
 		return "tcic";
 	else
-- 
cgit v1.2.1