---

yaml --- r: 24759 b: refs/heads/master c: bc0e1fc h: refs/heads/master i: 24757: 8e3f42c 24755: e1ebf90 24751: 3f43f84 v: v3
git-mirror · Mar 29, 2006 · 62e8dac · 62e8dac
1 parent 416bb3d
commit 62e8dac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8a91ed60f58451342a25f3ab4484c7257430aa8e
+refs/heads/master: bc0e1fc970279c539db1e94dd473acbb193ee473
diff --git a/trunk/drivers/net/pcnet32.c b/trunk/drivers/net/pcnet32.c
@@ -1167,8 +1167,8 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
 	 * station address PROM at the base address and programmed into the
 	 * "Physical Address Registers" CSR12-14.
 	 * As a precautionary measure, we read the PROM values and complain if
-	 * they disagree with the CSRs.  Either way, we use the CSR values, and
-	 * double check that they are valid.
+	 * they disagree with the CSRs.  If they miscompare, and the PROM addr
+	 * is valid, then the PROM addr is used.
 	 */
 	for (i = 0; i < 3; i++) {
 		unsigned int val;