2000-12-31 21:59:55

by Mohammad A. Haque

[permalink] [raw]

Subject: [PATCH] 2.4.0-prerelease -- rcpci45 compile error

---

--- linux/drivers/net/rcpci45.c.orig Sun Dec 31 15:58:05 2000
+++ linux/drivers/net/rcpci45.c Sun Dec 31 16:27:04 2000
@@ -157,7 +157,7 @@
{ RC_PCI45_VENDOR_ID, RC_PCI45_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
{0, }
};
-MODULE_DEVICE_TABLE(pci, rcpci_pci_table);
+MODULE_DEVICE_TABLE(pci, rcpci45_pci_table);

static void rcpci45_remove_one(struct pci_dev *pdev)
{

---

Attachments:

rcpci45.diff (378.00 B)

2000-12-31 23:28:54

by Frank Davis

[permalink] [raw]

Subject: Re: [PATCH] 2.4.0-prerelease -- rcpci45 compile error

---

Mohammad,
This appears to be a merge mismatch between Alan and Linus..This is
sent to Alan shortly after test13pre4-ac2 was released.
Regards,
Frank

--- linux/drivers/net/rcpci45.c.orig Sun Dec 31 15:58:05 2000 +++
linux/drivers/net/rcpci45.c Sun Dec 31 16:27:04 2000 @@ -157,7
+157,7 @@ { RC_PCI45_VENDOR_ID, RC_PCI45_DEVICE_ID, PCI_ANY_ID,
PCI_ANY_ID, 0, 0, 0}, {0, } };
-MODULE_DEVICE_TABLE(pci, rcpci_pci_table); +MODULE_DEVICE_TABLE(pci,
rcpci45_pci_table); static void
rcpci45_remove_one(struct pci_dev *pdev) {