diff --git a/[refs] b/[refs] index 129c8505197a..5f84b455e112 100644 --- 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 index 9595f74da93f..07c31f19c6ba 100644 --- 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;